| Index: trunk/phase3/includes/filerepo/File.php |
| — | — | @@ -215,8 +215,12 @@ |
| 216 | 216 | * @return String |
| 217 | 217 | */ |
| 218 | 218 | public function getFullUrl() { |
| 219 | | - return wfExpandUrl( $this->getUrl() ); |
| | 219 | + return wfExpandUrl( $this->getUrl(), PROTO_RELATIVE ); |
| 220 | 220 | } |
| | 221 | + |
| | 222 | + public function getCanonicalUrl() { |
| | 223 | + return wfExpandUrl( $this->getUrl(), PROTO_CANONICAL ); |
| | 224 | + } |
| 221 | 225 | |
| 222 | 226 | /** |
| 223 | 227 | * @return string |
| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -411,7 +411,7 @@ |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | function homelink() { |
| 415 | | - return Xml::element( 'base', array(), Title::newMainPage()->getFullUrl() ); |
| | 415 | + return Xml::element( 'base', array(), Title::newMainPage()->getCanonicalUrl() ); |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | function caseSetting() { |
| — | — | @@ -644,7 +644,7 @@ |
| 645 | 645 | " " . Xml::elementClean( 'comment', null, $file->getDescription() ) . "\n" . |
| 646 | 646 | " " . Xml::element( 'filename', null, $file->getName() ) . "\n" . |
| 647 | 647 | $archiveName . |
| 648 | | - " " . Xml::element( 'src', null, $file->getFullUrl() ) . "\n" . |
| | 648 | + " " . Xml::element( 'src', null, $file->getCanonicalUrl() ) . "\n" . |
| 649 | 649 | " " . Xml::element( 'size', null, $file->getSize() ) . "\n" . |
| 650 | 650 | " " . Xml::element( 'sha1base36', null, $file->getSha1() ) . "\n" . |
| 651 | 651 | " " . Xml::element( 'rel', null, $file->getRel() ) . "\n" . |