Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174897
Change subject: Handle radio-range oddity when $min < 0
......................................................................
Handle radio-range oddity when $min < 0
Change-Id: I238a67dc0226abdd8eefacd3a9308a6dc2275c7f
---
M includes/htmlform/HTMLFormRadioRangeColumnLabels.php
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/97/174897/1
diff --git a/includes/htmlform/HTMLFormRadioRangeColumnLabels.php
b/includes/htmlform/HTMLFormRadioRangeColumnLabels.php
index 16f019b..7058305 100644
--- a/includes/htmlform/HTMLFormRadioRangeColumnLabels.php
+++ b/includes/htmlform/HTMLFormRadioRangeColumnLabels.php
@@ -14,10 +14,18 @@
return $this->getDefault();
}
+ $neg = false;
+ foreach ( $values as $k => $v ) {
+ if ( preg_match( '/^-\d+$/', $k ) ) {
+ $neg = true;
+ }
+ }
+
$ret = array();
foreach ( $values as $k => $v ) {
if ( preg_match( '/^-?\d+$/', $k ) ) {
- $ret["column$k"] = $v;
+ $key = ( $neg && $k > 0 ) ? "+$k" : $k;
+ $ret["column$key"] = $v;
}
}
return $ret;
@@ -37,8 +45,9 @@
}
for ( $i = $min; $i <= $max; $i++ ) {
- if ( !isset( $value["column$i"] ) ) {
- return $this->msg(
'securepoll-htmlform-radiorange-missing-message', $i )
+ $key = ( $min < 0 && $i > 0 ) ? "+$i" : $i;
+ if ( !isset( $value["column$key"] ) ) {
+ return $this->msg(
'securepoll-htmlform-radiorange-missing-message', $key )
->parseAsBlock();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/174897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I238a67dc0226abdd8eefacd3a9308a6dc2275c7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
