| Index: trunk/phase3/includes/specials/SpecialUnblock.php |
| — | — | @@ -51,13 +51,6 @@ |
| 52 | 52 | list( $this->target, $this->type ) = SpecialBlock::getTargetAndType( $par, $wgRequest ); |
| 53 | 53 | $this->block = Block::newFromTarget( $this->target ); |
| 54 | 54 | |
| 55 | | - # bug 15810: blocked admins should have limited access here. This won't allow sysops |
| 56 | | - # to remove autoblocks on themselves, but they should have ipblock-exempt anyway |
| 57 | | - $status = SpecialBlock::checkUnblockSelf( $this->target ); |
| 58 | | - if ( $status !== true ) { |
| 59 | | - throw new ErrorPageError( 'badaccess', $status ); |
| 60 | | - } |
| 61 | | - |
| 62 | 55 | $wgOut->setPageTitle( wfMsg( 'unblockip' ) ); |
| 63 | 56 | $wgOut->addModules( 'mediawiki.special' ); |
| 64 | 57 | |
| — | — | @@ -162,6 +155,14 @@ |
| 163 | 156 | return array( array( 'ipb_cant_unblock', $target ) ); |
| 164 | 157 | } |
| 165 | 158 | |
| | 159 | + # bug 15810: blocked admins should have limited access here. This |
| | 160 | + # won't allow sysops to remove autoblocks on themselves, but they |
| | 161 | + # should have ipblock-exempt anyway |
| | 162 | + $status = SpecialBlock::checkUnblockSelf( $target ); |
| | 163 | + if ( $status !== true ) { |
| | 164 | + throw new ErrorPageError( 'badaccess', $status ); |
| | 165 | + } |
| | 166 | + |
| 166 | 167 | # If the specified IP is a single address, and the block is a range block, don't |
| 167 | 168 | # unblock the whole range. |
| 168 | 169 | list( $target, $type ) = SpecialBlock::getTargetAndType( $target ); |