Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67583


Change subject: Remember kids, 'wiki' and 'wikipedia' aren't the same thing!!
......................................................................

Remember kids, 'wiki' and 'wikipedia' aren't the same thing!!

Change-Id: I6494bdaaa1fdc6ec94b8a4a86cf84b28eac7f8c0
---
M includes/user/Auth.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll 
refs/changes/83/67583/1

diff --git a/includes/user/Auth.php b/includes/user/Auth.php
index 85e0578..ebf654a 100644
--- a/includes/user/Auth.php
+++ b/includes/user/Auth.php
@@ -296,8 +296,12 @@
                if ( class_exists( 'SiteMatrix' ) ) {
                        // Get wgServer from $lang (minor) and $site (major) 
combo
                        // Correct domain isn't guaranteed from 
$minor.$major.org
+                       // And 'wiki' and 'wikipedia' aren't the same blasted 
thing
                        $matrix = new SiteMatrix();
-                       $server = $matrix->getUrl( $params['lang'], 
$params['site'] );
+                       $server = $matrix->getUrl(
+                               $params['lang'],
+                               str_replace( 'wikipedia', 'wiki', 
$params['site'] )
+                       );
                        $params['wgServer'] = $server;
                        $vars["\$wgServer"] = $server;
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/67583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6494bdaaa1fdc6ec94b8a4a86cf84b28eac7f8c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to