Stop using SiteConfiguration::isLocalVHost()
authorChad Horohoe <chadh@wikimedia.org>
Thu, 11 Feb 2016 18:26:30 +0000 (10:26 -0800)
committerChad Horohoe <chadh@wikimedia.org>
Thu, 11 Feb 2016 18:26:30 +0000 (10:26 -0800)
It's deprecated and nothing sets it anymore

Change-Id: Idad23551c7c31c9d05fd9e1be2efadc941860058

includes/HttpFunctions.php

index 5ede04f..a31b157 100644 (file)
@@ -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;
                                }
                        }