| Index: trunk/phase3/includes/ProxyTools.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | if ( !$skip ) { |
| 85 | 85 | $title = SpecialPage::getTitleFor( 'Blockme' ); |
| 86 | 86 | $iphash = md5( $ip . $wgProxyKey ); |
| 87 | | - $url = $title->getFullURL( 'ip='.$iphash ); |
| | 87 | + $url = wfExpandUrl( $title->getFullURL( 'ip='.$iphash ), PROTO_HTTP ); |
| 88 | 88 | |
| 89 | 89 | foreach ( $wgProxyPorts as $port ) { |
| 90 | 90 | $params = implode( ' ', array( |
| Index: trunk/phase3/includes/Feed.php |
| — | — | @@ -308,7 +308,7 @@ |
| 309 | 309 | ?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/"> |
| 310 | 310 | <channel> |
| 311 | 311 | <title><?php print $this->getTitle() ?></title> |
| 312 | | - <link><?php print $this->getUrl() ?></link> |
| | 312 | + <link><?php print wfExpandUrl( $this->getUrl(), PROTO_CURRENT ) ?></link> |
| 313 | 313 | <description><?php print $this->getDescription() ?></description> |
| 314 | 314 | <language><?php print $this->getLanguage() ?></language> |
| 315 | 315 | <generator>MediaWiki <?php print $wgVersion ?></generator> |
| — | — | @@ -324,12 +324,12 @@ |
| 325 | 325 | ?> |
| 326 | 326 | <item> |
| 327 | 327 | <title><?php print $item->getTitle() ?></title> |
| 328 | | - <link><?php print $item->getUrl() ?></link> |
| | 328 | + <link><?php print wfExpandUrl( $item->getUrl(), PROTO_CURRENT ) ?></link> |
| 329 | 329 | <guid<?php if( !$item->RSSIsPermalink ) print ' isPermaLink="false"' ?>><?php print $item->getUniqueId() ?></guid> |
| 330 | 330 | <description><?php print $item->getDescription() ?></description> |
| 331 | 331 | <?php if( $item->getDate() ) { ?><pubDate><?php print $this->formatTime( $item->getDate() ) ?></pubDate><?php } ?> |
| 332 | 332 | <?php if( $item->getAuthor() ) { ?><dc:creator><?php print $item->getAuthor() ?></dc:creator><?php }?> |
| 333 | | - <?php if( $item->getComments() ) { ?><comments><?php print $item->getComments() ?></comments><?php }?> |
| | 333 | + <?php if( $item->getComments() ) { ?><comments><?php print wfExpandUrl( $item->getComments(), PROTO_CURRENT ) ?></comments><?php }?> |
| 334 | 334 | </item> |
| 335 | 335 | <?php |
| 336 | 336 | } |
| — | — | @@ -368,8 +368,8 @@ |
| 369 | 369 | ?><feed xmlns="http://www.w3.org/2005/Atom" xml:lang="<?php print $this->getLanguage() ?>"> |
| 370 | 370 | <id><?php print $this->getFeedId() ?></id> |
| 371 | 371 | <title><?php print $this->getTitle() ?></title> |
| 372 | | - <link rel="self" type="application/atom+xml" href="<?php print $this->getSelfUrl() ?>"/> |
| 373 | | - <link rel="alternate" type="text/html" href="<?php print $this->getUrl() ?>"/> |
| | 372 | + <link rel="self" type="application/atom+xml" href="<?php print wfExpandUrl( $this->getSelfUrl(), PROTO_CURRENT ) ?>"/> |
| | 373 | + <link rel="alternate" type="text/html" href="<?php print wfExpandUrl( $this->getUrl(), PROTO_CURRENT ) ?>"/> |
| 374 | 374 | <updated><?php print $this->formatTime( wfTimestampNow() ) ?>Z</updated> |
| 375 | 375 | <subtitle><?php print $this->getDescription() ?></subtitle> |
| 376 | 376 | <generator>MediaWiki <?php print $wgVersion ?></generator> |
| — | — | @@ -410,7 +410,7 @@ |
| 411 | 411 | <entry> |
| 412 | 412 | <id><?php print $item->getUniqueId() ?></id> |
| 413 | 413 | <title><?php print $item->getTitle() ?></title> |
| 414 | | - <link rel="alternate" type="<?php print $wgMimeType ?>" href="<?php print $item->getUrl() ?>"/> |
| | 414 | + <link rel="alternate" type="<?php print $wgMimeType ?>" href="<?php print wfExpandUrl( $item->getUrl(), PROTO_CURRENT ) ?>"/> |
| 415 | 415 | <?php if( $item->getDate() ) { ?> |
| 416 | 416 | <updated><?php print $this->formatTime( $item->getDate() ) ?>Z</updated> |
| 417 | 417 | <?php } ?> |
| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -381,7 +381,7 @@ |
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | if ( is_object( $wgTitle ) && !isset( $this->reqHeaders['Referer'] ) ) { |
| 385 | | - $this->setReferer( $wgTitle->getFullURL() ); |
| | 385 | + $this->setReferer( wfExpandUrl( $wgTitle->getFullURL(), PROTO_CURRENT ) ); |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | if ( !$this->noProxy ) { |