| Index: branches/wmf/1.17wmf1/includes/User.php |
| — | — | @@ -3034,7 +3034,7 @@ |
| 3035 | 3035 | |
| 3036 | 3036 | /** |
| 3037 | 3037 | * Internal function to format the e-mail validation/invalidation URLs. |
| 3038 | | - * This uses $wgArticlePath directly as a quickie hack to use the |
| | 3038 | + * This uses a quickie hack to use the |
| 3039 | 3039 | * hardcoded English names of the Special: pages, for ASCII safety. |
| 3040 | 3040 | * |
| 3041 | 3041 | * @note Since these URLs get dropped directly into emails, using the |
| — | — | @@ -3047,14 +3047,9 @@ |
| 3048 | 3048 | * @return \string Formatted URL |
| 3049 | 3049 | */ |
| 3050 | 3050 | protected function getTokenUrl( $page, $token ) { |
| 3051 | | - global $wgCanonicalServer, $wgArticlePath; |
| 3052 | | - |
| 3053 | | - return $wgCanonicalServer . |
| 3054 | | - str_replace( |
| 3055 | | - '$1', |
| 3056 | | - "Special:$page/$token", |
| 3057 | | - $wgArticlePath |
| 3058 | | - ); |
| | 3051 | + // Hack to bypass localization of 'Special:' |
| | 3052 | + $title = Title::makeTitle( NS_MAIN, "Special:$page/$token" ); |
| | 3053 | + return $title->getCanonicalUrl(); |
| 3059 | 3054 | } |
| 3060 | 3055 | |
| 3061 | 3056 | /** |
| Property changes on: branches/wmf/1.17wmf1/includes/User.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3062 | 3057 | Merged /trunk/phase3/includes/User.php:r95894 |