| Index: trunk/phase3/includes/User.php |
| — | — | @@ -374,7 +374,7 @@ |
| 375 | 375 | * master. |
| 376 | 376 | */ |
| 377 | 377 | function getBlockedStatus( $bFromSlave = true ) { |
| 378 | | - global $wgProxyList, $wgEnableSorbs, $wgProxyWhitelist; |
| | 378 | + global $wgEnableSorbs, $wgProxyWhitelist; |
| 379 | 379 | |
| 380 | 380 | if ( -1 != $this->mBlockedby ) { |
| 381 | 381 | wfDebug( "User::getBlockedStatus: already loaded.\n" ); |
| — | — | @@ -406,7 +406,7 @@ |
| 407 | 407 | if ( !$this->isSysop() && !in_array( $ip, $wgProxyWhitelist ) ) { |
| 408 | 408 | |
| 409 | 409 | # Local list |
| 410 | | - if ( array_key_exists( $ip, $wgProxyList ) ) { |
| | 410 | + if ( wfIsLocallyBlockedProxy( $ip ) ) { |
| 411 | 411 | $this->mBlockedby = wfMsg( 'proxyblocker' ); |
| 412 | 412 | $this->mBlockreason = wfMsg( 'proxyblockreason' ); |
| 413 | 413 | } |