| Index: trunk/phase3/includes/SpecialBlockip.php |
| — | — | @@ -83,10 +83,13 @@ |
| 84 | 84 | |
| 85 | 85 | $blockExpiryFormOptions = "<option value=\"other\">$mIpbothertime</option>"; |
| 86 | 86 | foreach (explode(',', $scBlockExpiryOptions) as $option) { |
| | 87 | + list($show, $value) = explode(":", $option); |
| | 88 | + $show = htmlspecialchars($show); |
| | 89 | + $value = htmlspecialchars($value); |
| 87 | 90 | $selected = ""; |
| 88 | | - if ($this->BlockExpiry === $option) |
| | 91 | + if ($this->BlockExpiry === $value) |
| 89 | 92 | $selected = ' selected="selected"'; |
| 90 | | - $blockExpiryFormOptions .= "<option$selected>$option</option>"; |
| | 93 | + $blockExpiryFormOptions .= "<option value=\"$value\"$selected>$show</option>"; |
| 91 | 94 | } |
| 92 | 95 | |
| 93 | 96 | $token = htmlspecialchars( $wgUser->editToken() ); |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1405,7 +1405,7 @@ |
| 1406 | 1406 | 'ipbreason' => 'Reason', |
| 1407 | 1407 | 'ipbsubmit' => 'Block this user', |
| 1408 | 1408 | 'ipbother' => 'Other time', |
| 1409 | | -'ipboptions' => '2 hours,1 day,3 days,1 week,2 weeks,1 month,3 months,6 months,1 year,infinite', |
| | 1409 | +'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', |
| 1410 | 1410 | 'ipbotheroption' => 'other', |
| 1411 | 1411 | 'badipaddress' => 'Invalid IP address', |
| 1412 | 1412 | 'blockipsuccesssub' => 'Block succeeded', |