| Index: branches/wmf/1.18wmf1/includes/User.php |
| — | — | @@ -2920,6 +2920,7 @@ |
| 2921 | 2921 | * @return bool A block was spread |
| 2922 | 2922 | */ |
| 2923 | 2923 | protected function spreadBlock() { |
| | 2924 | + global $wgRequest; |
| 2924 | 2925 | wfDebug( __METHOD__ . "()\n" ); |
| 2925 | 2926 | $this->load(); |
| 2926 | 2927 | if ( $this->mId == 0 ) { |
| — | — | @@ -2931,7 +2932,7 @@ |
| 2932 | 2933 | return false; |
| 2933 | 2934 | } |
| 2934 | 2935 | |
| 2935 | | - return (bool)$userblock->doAutoblock( $this->getRequest()->getIP() ); |
| | 2936 | + return (bool)$userblock->doAutoblock( $wgRequest->getIP() ); |
| 2936 | 2937 | } |
| 2937 | 2938 | |
| 2938 | 2939 | /** |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialMovepage.php |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | $permErrors = $this->oldTitle->getUserPermissionsErrors( 'move', $wgUser ); |
| 77 | 77 | if( !empty( $permErrors ) ) { |
| 78 | 78 | // Auto-block user's IP if the account was "hard" blocked |
| 79 | | - $user->spreadAnyEditBlock(); |
| | 79 | + $wgUser->spreadAnyEditBlock(); |
| 80 | 80 | $this->getOutput()->showPermissionsErrorPage( $permErrors ); |
| 81 | 81 | return; |
| 82 | 82 | } |