| Index: branches/REL1_18/extensions/GlobalBlocking/SpecialGlobalBlock.php |
| — | — | @@ -181,7 +181,7 @@ |
| 182 | 182 | $fields = array (); |
| 183 | 183 | |
| 184 | 184 | // Who to block |
| 185 | | - $fields['ipaddress'] = |
| | 185 | + $fields['globalblocking-ipaddress'] = |
| 186 | 186 | Xml::input( 'wpAddress', |
| 187 | 187 | 45, |
| 188 | 188 | $this->mAddress, |
| — | — | @@ -246,7 +246,7 @@ |
| 247 | 247 | // Block all users, or just anonymous ones |
| 248 | 248 | $fields['globalblocking-block-options'] = |
| 249 | 249 | Xml::checkLabel( |
| 250 | | - wfMsg( 'ipbanononly' ), |
| | 250 | + wfMsg( 'globalblocking-ipbanononly' ), |
| 251 | 251 | 'wpAnonOnly', |
| 252 | 252 | 'mw-globalblock-anon-only', |
| 253 | 253 | $this->mAnonOnly |
| Index: branches/REL1_18/extensions/GlobalBlocking/GlobalBlocking.i18n.php |
| — | — | @@ -30,6 +30,8 @@ |
| 31 | 31 | 'globalblocking-block-expiry-otherfield' => 'Other time:', |
| 32 | 32 | 'globalblocking-block-legend' => 'Block an IP address globally', |
| 33 | 33 | 'globalblocking-block-options' => 'Options:', |
| | 34 | + 'globalblocking-ipaddress' => 'IP address:', |
| | 35 | + 'globalblocking-ipbanononly' => 'Block anonymous users only', |
| 34 | 36 | 'globalblocking-block-errors' => "Your block was unsuccessful, for the following {{PLURAL:$1|reason|reasons}}:", |
| 35 | 37 | 'globalblocking-block-ipinvalid' => 'The IP address ($1) you entered is invalid. |
| 36 | 38 | Please note that you cannot enter a user name!', |
| Index: branches/REL1_18/extensions/GlobalBlocking/SpecialGlobalBlockList.php |
| — | — | @@ -105,7 +105,10 @@ |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | function loadParameters( $ip ) { |
| 109 | | - $this->mSearchIP = Block::normaliseRange( trim( $ip ) ); |
| | 109 | + $ip = trim( $ip ); |
| | 110 | + $this->mSearchIP = ( $ip !== '' ) |
| | 111 | + ? Block::normaliseRange( $ip ) |
| | 112 | + : ''; |
| 110 | 113 | } |
| 111 | 114 | } |
| 112 | 115 | |
| Index: branches/REL1_18/extensions/CodeReview/modules/ext.codereview.js |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | good = false; |
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | | - if( good && tags[i].indexOf( lastTag ) != -1 ){ |
| | 30 | + if( good && ('' + tags[i]).indexOf( lastTag ) != -1 ){ |
| 31 | 31 | suggestions.push( doneTags + tags[i] ); |
| 32 | 32 | } |
| 33 | 33 | } |
| Property changes on: branches/REL1_18/extensions/CodeReview |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 34 | 34 | Merged /trunk/extensions/CodeReview:r100092 |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Merged /trunk/extensions:r98607,99897,100092 |