| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3302,7 +3302,7 @@ |
| 3303 | 3303 | |
| 3304 | 3304 | /** |
| 3305 | 3305 | * Internal function to format the e-mail validation/invalidation URLs. |
| 3306 | | - * This uses $wgArticlePath directly as a quickie hack to use the |
| | 3306 | + * This uses a quickie hack to use the |
| 3307 | 3307 | * hardcoded English names of the Special: pages, for ASCII safety. |
| 3308 | 3308 | * |
| 3309 | 3309 | * @note Since these URLs get dropped directly into emails, using the |
| — | — | @@ -3315,14 +3315,9 @@ |
| 3316 | 3316 | * @return String Formatted URL |
| 3317 | 3317 | */ |
| 3318 | 3318 | protected function getTokenUrl( $page, $token ) { |
| 3319 | | - global $wgCanonicalServer, $wgArticlePath; |
| 3320 | | - |
| 3321 | | - return $wgCanonicalServer . |
| 3322 | | - str_replace( |
| 3323 | | - '$1', |
| 3324 | | - "Special:$page/$token", |
| 3325 | | - $wgArticlePath |
| 3326 | | - ); |
| | 3319 | + // Hack to bypass localization of 'Special:' |
| | 3320 | + $title = Title::makeTitle( NS_MAIN, "Special:$page/$token" ); |
| | 3321 | + return $title->getCanonicalUrl(); |
| 3327 | 3322 | } |
| 3328 | 3323 | |
| 3329 | 3324 | /** |