Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64982
Change subject: Removing prefix exception for HTMLCheckMatrix
......................................................................
Removing prefix exception for HTMLCheckMatrix
Unifying how the option prefix is handled for HTMLCheckMatrix and
HTMLMultiSelectField. This needs to be deployed at the same time
as the dependant Echo extension change.
Change-Id: I4049b666db554283ce953387a30a0a8a7d0cd920
---
M includes/Preferences.php
1 file changed, 2 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/64982/1
diff --git a/includes/Preferences.php b/includes/Preferences.php
index d11b2e2..a6d530f 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -157,7 +157,7 @@
foreach ( $columns as $column ) {
foreach ( $rows as $row ) {
- if ( $user->getOption(
"$prefix-$column-$row" ) ) {
+ if ( $user->getOption(
"$prefix$column-$row" ) ) {
$val[] = "$column-$row";
}
}
@@ -1571,14 +1571,7 @@
foreach ( $this->mFlatFields as $fieldname => $field ) {
if ( $field instanceof HTMLNestedFilterable ) {
$info = $field->mParams;
- 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";
- }
+ $prefix = isset( $info['prefix'] ) ?
$info['prefix'] : $fieldname;
foreach ( $field->filterDataForSubmit(
$data[$fieldname] ) as $key => $value ) {
$data["$prefix$key"] = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/64982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4049b666db554283ce953387a30a0a8a7d0cd920
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari <rkald...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
