Kaldari has submitted this change and it was merged. Change subject: Fix for wrong prefixing of multi checkbox ......................................................................
Fix for wrong prefixing of multi checkbox Bug: 48693 Change-Id: Ifd8d1d54d5252da958c30cdc0ffa1155ba4cf924 --- M includes/Preferences.php 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Kaldari: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Preferences.php b/includes/Preferences.php index 1733b37..0ada22b 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -1567,9 +1567,16 @@ foreach ( $this->mFlatFields as $fieldname => $field ) { if ( $field instanceof HTMLNestedFilterable ) { $info = $field->mParams; - $prefix = isset( $info['prefix'] ) ? $info['prefix'] : $fieldname; + if ( $field instanceof HTMLCheckMatrix ) { + // Echo's use of html check matrix expects the fieldname to be appended with - + // TODO: adjust echo to pass an explicit prefix containing the - and remove + // this misdirection at that time. + $prefix = isset( $info['prefix'] ) ? $info['prefix'] : "$fieldname-"; + } else { + $prefix = isset( $info['prefix'] ) ? $info['prefix'] : "$fieldname"; + } foreach ( $field->filterDataForSubmit( $data[$fieldname] ) as $key => $value ) { - $data["$prefix-$key"] = $value; + $data["$prefix$key"] = $value; } unset( $data[$fieldname] ); } -- To view, visit https://gerrit.wikimedia.org/r/64963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd8d1d54d5252da958c30cdc0ffa1155ba4cf924 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf4 Gerrit-Owner: Kaldari <rkald...@wikimedia.org> Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org> Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits