From: Chad Horohoe <chadh@wikimedia.org>
Date: Thu, 11 Feb 2016 18:26:30 +0000 (-0800)
Subject: Stop using SiteConfiguration::isLocalVHost()
X-Git-Tag: 1.31.0-rc.0~7940^2
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=3d4a3bd1e4afe2a3cf6a693942697aea2ea96dcf;p=lhc%2Fweb%2Fwiklou.git

Stop using SiteConfiguration::isLocalVHost()

It's deprecated and nothing sets it anymore

Change-Id: Idad23551c7c31c9d05fd9e1be2efadc941860058
---

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 5ede04f0da..a31b1576b2 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -131,7 +131,7 @@ class Http {
 	 * @return bool
 	 */
 	public static function isLocalURL( $url ) {
-		global $wgCommandLineMode, $wgLocalVirtualHosts, $wgConf;
+		global $wgCommandLineMode, $wgLocalVirtualHosts;
 
 		if ( $wgCommandLineMode ) {
 			return false;
@@ -156,9 +156,7 @@ class Http {
 					$domain = $domainPart . '.' . $domain;
 				}
 
-				if ( in_array( $domain, $wgLocalVirtualHosts )
-					|| $wgConf->isLocalVHost( $domain )
-				) {
+				if ( in_array( $domain, $wgLocalVirtualHosts ) ) {
 					return true;
 				}
 			}