http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95652
Revision: 95652
Author: catrope
Date: 2011-08-29 09:00:39 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
Protocol-relative URL fixes for CentralAuth and SiteMatrix:
* No need to expand the return value of WikiReference::getUrl() after r95961
* Like in r95961, switch ApiQueryGlobalUserInfo::getUrl() to pull
'wgCanonicalUrl' rather than 'wgServer' from $wgConf, and don't expand its
return value
* Same for SiteMatrix::getUrl()
* Use getCanonicalUrl() for IRC line
Modified Paths:
--------------
trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php
trunk/extensions/CentralAuth/CentralAuthUser.php
trunk/extensions/SiteMatrix/SiteMatrixApi.php
trunk/extensions/SiteMatrix/SiteMatrix_body.php
Modified: trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php
===================================================================
--- trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php 2011-08-29
08:55:35 UTC (rev 95651)
+++ trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php 2011-08-29
09:00:39 UTC (rev 95652)
@@ -82,7 +82,7 @@
$a = array(
'wiki' => $dbname,
- 'url' => wfExpandUrl( $this->getUrl(
$dbname ) ),
+ 'url' => $this->getUrl( $dbname ),
'timestamp' => wfTimestamp(
TS_ISO_8601, $account['attachedTimestamp'] ),
'method' => $account['attachedMethod'],
'editcount' => $account['editCount']
@@ -121,7 +121,7 @@
list( $major, $minor ) = $wgConf->siteFromDB( $dbname );
$minor = str_replace( '_', '-', $minor );
- return $wgConf->get( 'wgServer', $dbname, $major,
+ return $wgConf->get( 'wgCanonicalServer', $dbname, $major,
array( 'lang' => $minor, 'site' => $major ) );
}
Modified: trunk/extensions/CentralAuth/CentralAuthUser.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuthUser.php 2011-08-29 08:55:35 UTC
(rev 95651)
+++ trunk/extensions/CentralAuth/CentralAuthUser.php 2011-08-29 09:00:39 UTC
(rev 95652)
@@ -1188,8 +1188,7 @@
protected static function getIRCLine( $userpage, $wikiID ) {
$title = RecentChange::cleanupForIRC(
$userpage->getPrefixedText() );
$wikiID = RecentChange::cleanupForIRC( $wikiID );
- // FIXME: *HACK* should be getFullURL(), hacked for SSL madness
- $url = $userpage->getInternalURL();
+ $url = $userpage->getCanonicalURL();
$user = RecentChange::cleanupForIRC( $userpage->getText() );
# see http://www.irssi.org/documentation/formats for some
colour codes. prefix is \003,
# no colour (\003) switches back to the term default
Modified: trunk/extensions/SiteMatrix/SiteMatrixApi.php
===================================================================
--- trunk/extensions/SiteMatrix/SiteMatrixApi.php 2011-08-29 08:55:35 UTC
(rev 95651)
+++ trunk/extensions/SiteMatrix/SiteMatrixApi.php 2011-08-29 09:00:39 UTC
(rev 95652)
@@ -57,7 +57,7 @@
$url = $matrix->getUrl( $lang,
$site );
$site_out = array(
- 'url' => wfExpandUrl(
$url ),
+ 'url' => $url,
'dbname' =>
$matrix->getDBName( $lang, $site ),
'code' => $site,
);
@@ -91,7 +91,7 @@
$url = $matrix->getUrl( $lang, $site );
$wiki = array();
- $wiki['url'] = wfExpandUrl( $url );
+ $wiki['url'] = $url;
$wiki['dbname'] = $matrix->getDBName( $lang,
$site );
$wiki['code'] = str_replace( '_', '-', $lang )
. ( $site != 'wiki' ? $site : '' );
Modified: trunk/extensions/SiteMatrix/SiteMatrix_body.php
===================================================================
--- trunk/extensions/SiteMatrix/SiteMatrix_body.php 2011-08-29 08:55:35 UTC
(rev 95651)
+++ trunk/extensions/SiteMatrix/SiteMatrix_body.php 2011-08-29 09:00:39 UTC
(rev 95652)
@@ -135,7 +135,7 @@
global $wgConf;
$dbname = $this->getDBName( $minor, $major );
$minor = str_replace( '_', '-', $minor );
- return $wgConf->get( 'wgServer', $dbname, $major,
+ return $wgConf->get( 'wgCanonicalServer', $dbname, $major,
array( 'lang' => $minor, 'site' => $major ) );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
