Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64226
Change subject: In $wgConf, allow wgCanonicalServer to be false or absent
......................................................................
In $wgConf, allow wgCanonicalServer to be false or absent
According to the doc comment, $wgCanonicalServer can be false, and this
is equivalent to it being set to $wgServer. So don't require it to be
set for foreign wikis in $wgConf, just use the same interpretation.
This makes it slightly easier to set up CentralAuth test servers.
Change-Id: I5eb11669236ed2a71d08f53a1393a3d5e8f5f770
---
M includes/WikiMap.php
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/64226/1
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 5d90b12..da4416d 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -40,10 +40,15 @@
if ( $major === null ) {
return null;
}
- $canonicalServer = $wgConf->get( 'wgCanonicalServer', $wikiID,
$major,
- array( 'lang' => $minor, 'site' => $major ) );
$server = $wgConf->get( 'wgServer', $wikiID, $major,
array( 'lang' => $minor, 'site' => $major ) );
+
+ $canonicalServer = $wgConf->get( 'wgCanonicalServer', $wikiID,
$major,
+ array( 'lang' => $minor, 'site' => $major ) );
+ if ( $canonicalServer === false || $canonicalServer === null ) {
+ $canonicalServer = $server;
+ }
+
$path = $wgConf->get( 'wgArticlePath', $wikiID, $major,
array( 'lang' => $minor, 'site' => $major ) );
return new WikiReference( $major, $minor, $canonicalServer,
$path, $server );
--
To view, visit https://gerrit.wikimedia.org/r/64226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb11669236ed2a71d08f53a1393a3d5e8f5f770
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
