http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95651
Revision: 95651
Author: catrope
Date: 2011-08-29 08:55:35 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
In WikiMap, pull wgCanonicalServer from $wgConf instead of wgServer for
building URLs to foreign wikis. This means wgCanonicalServer is now expected to
always be available in wgConf; document this in RELEASE-NOTES (-1.18 because
this is for backporting).
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.18
trunk/phase3/includes/WikiMap.php
Modified: trunk/phase3/RELEASE-NOTES-1.18
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.18 2011-08-29 07:56:40 UTC (rev 95650)
+++ trunk/phase3/RELEASE-NOTES-1.18 2011-08-29 08:55:35 UTC (rev 95651)
@@ -621,6 +621,8 @@
* 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 ==
Modified: trunk/phase3/includes/WikiMap.php
===================================================================
--- trunk/phase3/includes/WikiMap.php 2011-08-29 07:56:40 UTC (rev 95650)
+++ trunk/phase3/includes/WikiMap.php 2011-08-29 08:55:35 UTC (rev 95651)
@@ -18,7 +18,7 @@
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 ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
