http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95903
Revision: 95903
Author: catrope
Date: 2011-08-31 19:22:28 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
1.17wmf1: MFT r95894 for real this time, followup r95901
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/User.php
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/User.php
Modified: branches/wmf/1.17wmf1/includes/User.php
===================================================================
--- branches/wmf/1.17wmf1/includes/User.php 2011-08-31 19:17:02 UTC (rev
95902)
+++ branches/wmf/1.17wmf1/includes/User.php 2011-08-31 19:22:28 UTC (rev
95903)
@@ -3034,7 +3034,7 @@
/**
* Internal function to format the e-mail validation/invalidation URLs.
- * This uses $wgArticlePath directly as a quickie hack to use the
+ * This uses a quickie hack to use the
* hardcoded English names of the Special: pages, for ASCII safety.
*
* @note Since these URLs get dropped directly into emails, using the
@@ -3047,14 +3047,9 @@
* @return \string Formatted URL
*/
protected function getTokenUrl( $page, $token ) {
- global $wgCanonicalServer, $wgArticlePath;
-
- return $wgCanonicalServer .
- str_replace(
- '$1',
- "Special:$page/$token",
- $wgArticlePath
- );
+ // Hack to bypass localization of 'Special:'
+ $title = Title::makeTitle( NS_MAIN, "Special:$page/$token" );
+ return $title->getCanonicalUrl();
}
/**
Property changes on: branches/wmf/1.17wmf1/includes/User.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/User.php:51646
/branches/REL1_17/phase3/includes/User.php:81684,87483
/branches/new-installer/phase3/includes/User.php:43664-66004
/branches/sqlite/includes/User.php:58211-58321
/branches/wmf/1.16wmf4/includes/User.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/User.php:53381,60970
/trunk/phase3/includes/User.php:80837,81612,81615,81657,81674,81689,81827,85128,93820-93822,93847,94990,94996,95000-95002,95007,95010-95011,95016-95017
+ /branches/REL1_15/phase3/includes/User.php:51646
/branches/REL1_17/phase3/includes/User.php:81684,87483
/branches/new-installer/phase3/includes/User.php:43664-66004
/branches/sqlite/includes/User.php:58211-58321
/branches/wmf/1.16wmf4/includes/User.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/User.php:53381,60970
/trunk/phase3/includes/User.php:80837,81612,81615,81657,81674,81689,81827,85128,93820-93822,93847,94990,94996,95000-95002,95007,95010-95011,95016-95017,95894
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
