aboutsummaryrefslogtreecommitdiffstats
path: root/includes/api/ApiQueryLangLinks.php
diff options
context:
space:
mode:
authorRoan Kattouw <catrope@users.mediawiki.org>2011-08-19 15:46:08 +0000
committerRoan Kattouw <catrope@users.mediawiki.org>2011-08-19 15:46:08 +0000
commitd8a27337570dc22d138ddbc3ac9a3dee6880c96e (patch)
tree3f774cf818402b846fb1730cc032115571b1112e /includes/api/ApiQueryLangLinks.php
parent16e540e5c3e07cb09f218d9bba2da9d41714b53d (diff)
downloadmediawikicore-d8a27337570dc22d138ddbc3ac9a3dee6880c96e.tar.gz
mediawikicore-d8a27337570dc22d138ddbc3ac9a3dee6880c96e.zip
Make the PROTO_ parameter to wfExpandUrl() explicit in all calls. There are now no calls to wfExpandUrl() in core that rely on PROTO_CURRENT being the default. Also switch to using getCanonicalUrl() for.... rel="canonical" :D (I picked the right name, I KNEW IT)
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/95010
Diffstat (limited to 'includes/api/ApiQueryLangLinks.php')
-rw-r--r--includes/api/ApiQueryLangLinks.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php
index 2583790efa3e..b0880bb5ef80 100644
--- a/includes/api/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -106,7 +106,7 @@ class ApiQueryLangLinks extends ApiQueryBase {
if ( $params['url'] ) {
$title = Title::newFromText( "{$row->ll_lang}:{$row->ll_title}" );
if ( $title ) {
- $entry['url'] = wfExpandUrl( $title->getFullURL() );
+ $entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT );
}
}
ApiResult::setContent( $entry, $row->ll_title );