From 34cb13e6b0d7e117c3dd1775c116b8ae51c19f78 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 3 Jun 2014 10:42:56 -0700 Subject: [PATCH] Renamed $ipSet static variable in IP to something better Change-Id: Ie7e049c9b114d2a76e1e8e985c3500bda4bbc0ef --- includes/utils/IP.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/utils/IP.php b/includes/utils/IP.php index e748e61de3..e4e1cfdfe8 100644 --- a/includes/utils/IP.php +++ b/includes/utils/IP.php @@ -66,7 +66,7 @@ define( 'IP_ADDRESS_STRING', */ class IP { /** @var IPSet */ - private static $ipSet = null; + private static $proxyIpSet = null; /** * Determine if a string is as valid IP address or network (CIDR prefix). @@ -718,10 +718,10 @@ class IP { // Check against addresses and CIDR nets in the NoPurge list if ( !$trusted ) { - if ( !self::$ipSet ) { - self::$ipSet = new IPSet( $wgSquidServersNoPurge ); + if ( !self::$proxyIpSet ) { + self::$proxyIpSet = new IPSet( $wgSquidServersNoPurge ); } - $trusted = self::$ipSet->match( $ip ); + $trusted = self::$proxyIpSet->match( $ip ); } wfProfileOut( __METHOD__ ); @@ -733,6 +733,6 @@ class IP { * Use this only for unit tests. */ public static function clearCaches() { - self::$ipSet = null; + self::$proxyIpSet = null; } } -- 2.20.1