| Index: branches/wmf/1.18wmf1/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php |
| — | — | @@ -67,7 +67,10 @@ |
| 68 | 68 | |
| 69 | 69 | function loadParameters() { |
| 70 | 70 | global $wgRequest; |
| 71 | | - $this->mAddress = Block::normaliseRange( trim( $wgRequest->getText( 'address' ) ) ); |
| | 71 | + $ip = trim( $wgRequest->getText( 'address' ) ); |
| | 72 | + $this->mAddress = ( $ip !== '' || $wgRequest->wasPosted() ) |
| | 73 | + ? Block::normaliseRange( $ip ) |
| | 74 | + : ''; |
| 72 | 75 | $this->mReason = $wgRequest->getText( 'wpReason' ); |
| 73 | 76 | $this->mWhitelistStatus = $wgRequest->getCheck( 'wpWhitelistStatus' ); |
| 74 | 77 | $this->mEditToken = $wgRequest->getText( 'wpEditToken' ); |
| — | — | @@ -150,6 +153,7 @@ |
| 151 | 154 | |
| 152 | 155 | $fields = array(); |
| 153 | 156 | |
| | 157 | + // uses ipaddress msg |
| 154 | 158 | $fields['ipaddress'] = Xml::input( 'address', 45, $this->mAddress ); |
| 155 | 159 | $fields['globalblocking-whitelist-reason'] = Xml::input( 'wpReason', 45, $this->mReason ); |
| 156 | 160 | $fields['globalblocking-whitelist-status'] = Xml::checkLabel( wfMsgExt( 'globalblocking-whitelist-statuslabel', 'parsemag' ), 'wpWhitelistStatus', 'wpWhitelistStatus', $this->mCurrentStatus ); |