In WikiMap, pull wgCanonicalServer from $wgConf instead of wgServer for building...

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index b1845f7..4da63e2 100644 (file)
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -621,6 +621,8 @@ changes to languages because of Bugzilla reports.
 * Removed legacy wgAjaxWatch javascript global object, no longer in use.
 * (bug 28556) Upload support for MacBinary files has been removed (Used by
   Internet Explorer 5 for Mac OS 9)
+* On wiki farm setups using $wgConf, 'wgCanonicalServer' is now expected to be
+  set for all wikis. This was already the case for 'wgServer'.
 
 == Compatibility ==
 

diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 545e6a3..458718e 100644 (file)
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -18,7 +18,7 @@ class WikiMap {
 
                list( $major, $minor ) = $wgConf->siteFromDB( $wikiID );
                if( isset( $major ) ) {
-                       $server = $wgConf->get( 'wgServer', $wikiID, $major,
+                       $server = $wgConf->get( 'wgCanonicalServer', $wikiID, $major,
                                array( 'lang' => $minor, 'site' => $major ) );
                        $path = $wgConf->get( 'wgArticlePath', $wikiID, $major,
                                array( 'lang' => $minor, 'site' => $major ) );