http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98749

Revision: 98749
Author:   catrope
Date:     2011-10-03 10:56:51 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
1.17wmf1: MFT r98748

Modified Paths:
--------------
    branches/wmf/1.17wmf1/extensions/CentralAuth/CentralAuthHooks.php

Modified: branches/wmf/1.17wmf1/extensions/CentralAuth/CentralAuthHooks.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/CentralAuth/CentralAuthHooks.php   
2011-10-03 10:55:41 UTC (rev 98748)
+++ branches/wmf/1.17wmf1/extensions/CentralAuth/CentralAuthHooks.php   
2011-10-03 10:56:51 UTC (rev 98749)
@@ -294,7 +294,8 @@
                        $wgMemc->set( CentralAuthUser::memcKey( 'login-token', 
$loginToken ), $data, 600 );
 
                        $wiki = WikiMap::getWiki( $wiki );
-                       $url = $wiki->getUrl( 'Special:AutoLogin' );
+                       // Use WikiReference::getFullUrl(), returns a 
protocol-relative URL if needed
+                       $url = $wiki->getFullUrl( 'Special:AutoLogin' );
 
                        if ( strpos( $url, '?' ) > 0 ) {
                                $url .= "&logout=1&token=$loginToken";


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to