| Index: trunk/phase3/includes/api/ApiQuerySiteinfo.php |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | $data = array(); |
| 119 | 119 | $mainPage = Title::newMainPage(); |
| 120 | 120 | $data['mainpage'] = $mainPage->getPrefixedText(); |
| 121 | | - $data['base'] = wfExpandUrl( $mainPage->getFullUrl(), PROTO_HTTP ); |
| | 121 | + $data['base'] = wfExpandUrl( $mainPage->getFullUrl() ); |
| 122 | 122 | $data['sitename'] = $GLOBALS['wgSitename']; |
| 123 | 123 | $data['generator'] = "MediaWiki {$GLOBALS['wgVersion']}"; |
| 124 | 124 | $data['phpversion'] = phpversion(); |
| — | — | @@ -288,7 +288,7 @@ |
| 289 | 289 | if ( isset( $langNames[$prefix] ) ) { |
| 290 | 290 | $val['language'] = $langNames[$prefix]; |
| 291 | 291 | } |
| 292 | | - $val['url'] = wfExpandUrl( $row['iw_url'], PROTO_HTTP ); |
| | 292 | + $val['url'] = wfExpandUrl( $row['iw_url'] ); |
| 293 | 293 | if( isset( $row['iw_wikiid'] ) ) { |
| 294 | 294 | $val['wikiid'] = $row['iw_wikiid']; |
| 295 | 295 | } |
| — | — | @@ -456,7 +456,7 @@ |
| 457 | 457 | protected function appendRightsInfo( $property ) { |
| 458 | 458 | global $wgRightsPage, $wgRightsUrl, $wgRightsText; |
| 459 | 459 | $title = Title::newFromText( $wgRightsPage ); |
| 460 | | - $url = $title ? wfExpandUrl( $title->getFullURL(), PROTO_HTTP ) : $wgRightsUrl; |
| | 460 | + $url = $title ? wfExpandUrl( $title->getFullURL() ) : $wgRightsUrl; |
| 461 | 461 | $text = $wgRightsText; |
| 462 | 462 | if ( !$text && $title ) { |
| 463 | 463 | $text = $title->getPrefixedText(); |
| Index: trunk/phase3/includes/api/ApiParse.php |
| — | — | @@ -353,7 +353,7 @@ |
| 354 | 354 | |
| 355 | 355 | $entry['lang'] = $bits[0]; |
| 356 | 356 | if ( $title ) { |
| 357 | | - $entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_HTTP ); |
| | 357 | + $entry['url'] = wfExpandUrl( $title->getFullURL() ); |
| 358 | 358 | } |
| 359 | 359 | $this->getResult()->setContent( $entry, $bits[1] ); |
| 360 | 360 | $result[] = $entry; |
| — | — | @@ -435,7 +435,7 @@ |
| 436 | 436 | |
| 437 | 437 | $title = Title::newFromText( "{$prefix}:{$title}" ); |
| 438 | 438 | if ( $title ) { |
| 439 | | - $entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_HTTP ); |
| | 439 | + $entry['url'] = wfExpandUrl( $title->getFullURL() ); |
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | $this->getResult()->setContent( $entry, $title->getFullText() ); |
| Index: trunk/phase3/includes/api/ApiQuery.php |
| — | — | @@ -374,7 +374,7 @@ |
| 375 | 375 | ); |
| 376 | 376 | if ( $this->iwUrl ) { |
| 377 | 377 | $title = Title::newFromText( $rawTitleStr ); |
| 378 | | - $item['url'] = wfExpandUrl( $title->getFullURL(), PROTO_HTTP ); |
| | 378 | + $item['url'] = wfExpandUrl( $title->getFullURL() ); |
| 379 | 379 | } |
| 380 | 380 | $intrwValues[] = $item; |
| 381 | 381 | } |
| Index: trunk/phase3/includes/api/ApiQueryIWLinks.php |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | if ( $params['url'] ) { |
| 114 | 114 | $title = Title::newFromText( "{$row->iwl_prefix}:{$row->iwl_title}" ); |
| 115 | 115 | if ( $title ) { |
| 116 | | - $entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_HTTP ); |
| | 116 | + $entry['url'] = wfExpandUrl( $title->getFullURL() ); |
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | |
| Index: trunk/phase3/includes/api/ApiQueryLangLinks.php |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | if ( $params['url'] ) { |
| 108 | 108 | $title = Title::newFromText( "{$row->ll_lang}:{$row->ll_title}" ); |
| 109 | 109 | if ( $title ) { |
| 110 | | - $entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_HTTP ); |
| | 110 | + $entry['url'] = wfExpandUrl( $title->getFullURL() ); |
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | ApiResult::setContent( $entry, $row->ll_title ); |
| Index: trunk/phase3/includes/api/ApiQueryImageInfo.php |
| — | — | @@ -348,7 +348,7 @@ |
| 349 | 349 | if ( !is_null( $thumbParams ) ) { |
| 350 | 350 | $mto = $file->transform( $thumbParams ); |
| 351 | 351 | if ( $mto && !$mto->isError() ) { |
| 352 | | - $vals['thumburl'] = wfExpandUrl( $mto->getUrl(), PROTO_HTTP ); |
| | 352 | + $vals['thumburl'] = wfExpandUrl( $mto->getUrl() ); |
| 353 | 353 | |
| 354 | 354 | // bug 23834 - If the URL's are the same, we haven't resized it, so shouldn't give the wanted |
| 355 | 355 | // thumbnail sizes for the thumbnail actual size |
| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -380,8 +380,8 @@ |
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | if ( $this->fld_url ) { |
| 384 | | - $pageInfo['fullurl'] = wfExpandUrl( $title->getFullURL(), PROTO_HTTP ); |
| 385 | | - $pageInfo['editurl'] = wfExpandUrl( $title->getFullURL( 'action=edit' ), PROTO_HTTP ); |
| | 384 | + $pageInfo['fullurl'] = wfExpandUrl( $title->getFullURL() ); |
| | 385 | + $pageInfo['editurl'] = wfExpandUrl( $title->getFullURL( 'action=edit' ) ); |
| 386 | 386 | } |
| 387 | 387 | if ( $this->fld_readable && $title->userCanRead() ) { |
| 388 | 388 | $pageInfo['readable'] = ''; |