| Index: branches/wmf/1.18wmf1/includes/User.php |
| — | — | @@ -2920,7 +2920,6 @@ |
| 2921 | 2921 | * @return bool A block was spread |
| 2922 | 2922 | */ |
| 2923 | 2923 | protected function spreadBlock() { |
| 2924 | | - global $wgRequest; |
| 2925 | 2924 | wfDebug( __METHOD__ . "()\n" ); |
| 2926 | 2925 | $this->load(); |
| 2927 | 2926 | if ( $this->mId == 0 ) { |
| — | — | @@ -2932,7 +2931,7 @@ |
| 2933 | 2932 | return false; |
| 2934 | 2933 | } |
| 2935 | 2934 | |
| 2936 | | - return (bool)$userblock->doAutoblock( $wgRequest->getIP() ); |
| | 2935 | + return (bool)$userblock->doAutoblock( wfGetIP() ); |
| 2937 | 2936 | } |
| 2938 | 2937 | |
| 2939 | 2938 | /** |