From e3a3e9bafc1a91e0a386ba9d955fd42e2f9bef19 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Tue, 6 Dec 2005 13:29:07 +0000 Subject: [PATCH] Lazy initialisation of wgProxyList --- includes/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/User.php b/includes/User.php index 9e96e924be..0b47fa84b4 100644 --- a/includes/User.php +++ b/includes/User.php @@ -374,7 +374,7 @@ class User { * master. */ function getBlockedStatus( $bFromSlave = true ) { - global $wgProxyList, $wgEnableSorbs, $wgProxyWhitelist; + global $wgEnableSorbs, $wgProxyWhitelist; if ( -1 != $this->mBlockedby ) { wfDebug( "User::getBlockedStatus: already loaded.\n" ); @@ -406,7 +406,7 @@ class User { if ( !$this->isSysop() && !in_array( $ip, $wgProxyWhitelist ) ) { # Local list - if ( array_key_exists( $ip, $wgProxyList ) ) { + if ( wfIsLocallyBlockedProxy( $ip ) ) { $this->mBlockedby = wfMsg( 'proxyblocker' ); $this->mBlockreason = wfMsg( 'proxyblockreason' ); } -- 2.20.1