| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3315,14 +3315,14 @@ |
| 3316 | 3316 | * @return String Formatted URL |
| 3317 | 3317 | */ |
| 3318 | 3318 | protected function getTokenUrl( $page, $token ) { |
| 3319 | | - global $wgArticlePath; |
| 3320 | | - return wfExpandUrl( |
| | 3319 | + global $wgCanonicalServer, $wgArticlePath; |
| | 3320 | + |
| | 3321 | + return $wgCanonicalServer . |
| 3321 | 3322 | str_replace( |
| 3322 | 3323 | '$1', |
| 3323 | 3324 | "Special:$page/$token", |
| 3324 | | - $wgArticlePath ), |
| 3325 | | - PROTO_HTTP |
| 3326 | | - ); |
| | 3325 | + $wgArticlePath |
| | 3326 | + ); |
| 3327 | 3327 | } |
| 3328 | 3328 | |
| 3329 | 3329 | /** |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -523,7 +523,7 @@ |
| 524 | 524 | $keys = array(); |
| 525 | 525 | |
| 526 | 526 | if ( $this->oldid ) { |
| 527 | | - $difflink = wfExpandUrl( $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid ), PROTO_HTTP ); |
| | 527 | + $difflink = $this->title->getCanonicalUrl( 'diff=0&oldid=' . $this->oldid ); |
| 528 | 528 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink ); |
| 529 | 529 | $keys['$OLDID'] = $this->oldid; |
| 530 | 530 | $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' ); |
| — | — | @@ -540,17 +540,17 @@ |
| 541 | 541 | * revision. |
| 542 | 542 | */ |
| 543 | 543 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', |
| 544 | | - wfExpandUrl( $this->title->getFullURL( "oldid={$this->oldid}&diff=next" ), PROTO_HTTP ) ); |
| | 544 | + $this->title->getCanonicalUrl( "oldid={$this->oldid}&diff=next" ) ); |
| 545 | 545 | } |
| 546 | 546 | |
| 547 | 547 | $body = strtr( $body, $keys ); |
| 548 | 548 | $pagetitle = $this->title->getPrefixedText(); |
| 549 | 549 | $keys['$PAGETITLE'] = $pagetitle; |
| 550 | | - $keys['$PAGETITLE_URL'] = wfExpandUrl( $this->title->getFullUrl(), PROTO_HTTP ); |
| | 550 | + $keys['$PAGETITLE_URL'] = $this->title->getCanonicalUrl(); |
| 551 | 551 | |
| 552 | 552 | $keys['$PAGEMINOREDIT'] = $medit; |
| 553 | 553 | $keys['$PAGESUMMARY'] = $summary; |
| 554 | | - $keys['$UNWATCHURL'] = wfExpandUrl( $this->title->getFullUrl( 'action=unwatch' ), PROTO_HTTP ); |
| | 554 | + $keys['$UNWATCHURL'] = $this->title->getCanonicalUrl( 'action=unwatch' ); |
| 555 | 555 | |
| 556 | 556 | $subject = strtr( $subject, $keys ); |
| 557 | 557 | |
| — | — | @@ -585,10 +585,10 @@ |
| 586 | 586 | $subject = str_replace( '$PAGEEDITOR', $name, $subject ); |
| 587 | 587 | $keys['$PAGEEDITOR'] = $name; |
| 588 | 588 | $emailPage = SpecialPage::getSafeTitleFor( 'Emailuser', $name ); |
| 589 | | - $keys['$PAGEEDITOR_EMAIL'] = wfExpandUrl( $emailPage->getFullUrl(), PROTO_HTTP ); |
| | 589 | + $keys['$PAGEEDITOR_EMAIL'] = $emailPage->getCanonicalUrl(); |
| 590 | 590 | } |
| 591 | 591 | $userPage = $editor->getUserPage(); |
| 592 | | - $keys['$PAGEEDITOR_WIKI'] = wfExpandUrl( $userPage->getFullUrl(), PROTO_HTTP ); |
| | 592 | + $keys['$PAGEEDITOR_WIKI'] = $userPage->getCanonicalUrl(); |
| 593 | 593 | $body = strtr( $body, $keys ); |
| 594 | 594 | $body = wordwrap( $body, 72 ); |
| 595 | 595 | |