Merge "Improve WikiMap::getWikiReferenceFromWgConf()"

diff --combined includes/SiteConfiguration.php
index 5b9bdfa,4c048f7..9fd5983
--- 1/includes/SiteConfiguration.php
--- 2/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@@ -108,6 -108,11 +108,11 @@@
   * extract( $globals );
   * @endcode
   *
+  * @note For WikiMap to function, the configuration must define string values for
+  *  $wgServer (or $wgCanonicalServer) and $wgArticlePath, even if these are the
+  *  same for all wikis or can be correctly determined by the logic in
+  *  Setup.php.
+  *
   * @todo Give examples for,
   * suffixes:
   * $conf->suffixes = array( 'wiki' );
@@@ -565,6 -570,17 +570,6 @@@ class SiteConfiguration 
                return $multi ? $res : current( $res );
        }
  
 -      /**
 -       * Returns true if the given vhost is handled locally.
 -       *
 -       * @deprecated since 1.25; check if the host is in $wgLocalVirtualHosts instead.
 -       * @param string $vhost
 -       * @return bool
 -       */
 -      public function isLocalVHost( $vhost ) {
 -              return in_array( $vhost, $this->localVHosts );
 -      }
 -
        /**
         * Merge multiple arrays together.
         * On encountering duplicate keys, merge the two, but ONLY if they're arrays.