| Index: trunk/phase3/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -71,10 +71,10 @@ |
| 72 | 72 | |
| 73 | 73 | # bug 15810: blocked admins should have limited access here |
| 74 | 74 | if ( $wgUser->isBlocked() ) { |
| 75 | | - if ( $id ) { |
| | 75 | + if ( $this->id ) { |
| 76 | 76 | # This doesn't pick up on autoblocks, but admins |
| 77 | 77 | # should have the ipblock-exempt permission anyway |
| 78 | | - $block = Block::newFromID( $id ); |
| | 78 | + $block = Block::newFromID( $this->id ); |
| 79 | 79 | $user = User::newFromName( $block->mAddress ); |
| 80 | 80 | } else { |
| 81 | 81 | $user = User::newFromName( $ip ); |
| — | — | @@ -284,7 +284,8 @@ |
| 285 | 285 | $conds['ipb_id'] = substr( $this->ip, 1 ); |
| 286 | 286 | // Single IPs |
| 287 | 287 | } elseif ( IP::isIPAddress( $this->ip ) && strpos( $this->ip, '/' ) === false ) { |
| 288 | | - if( $iaddr = IP::toHex( $this->ip ) ) { |
| | 288 | + $iaddr = IP::toHex( $this->ip ); |
| | 289 | + if( $iaddr ) { |
| 289 | 290 | # Only scan ranges which start in this /16, this improves search speed |
| 290 | 291 | # Blocks should not cross a /16 boundary. |
| 291 | 292 | $range = substr( $iaddr, 0, 4 ); |