https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114021
Revision: 114021
Author: reedy
Date: 2012-03-16 16:21:14 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
MFT r114020
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/
branches/wmf/1.19wmf1/extensions/CentralAuth/
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112586,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112930,112993,113352,113367,113458,113926,113948,113964
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112586,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112930,112993,113352,113367,113458,113926,113948,113964,114020
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Property changes on: branches/wmf/1.19wmf1/extensions/CentralAuth
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions/CentralAuth:100352-107913
/branches/REL1_15/phase3/extensions/CentralAuth:51646
/branches/REL1_17/phase3/extensions/CentralAuth:81445,81448
/branches/new-installer/phase3/extensions/CentralAuth:43664-66004
/branches/sqlite/extensions/CentralAuth:58211-58321
/branches/wmf/1.18wmf1/extensions/CentralAuth:97508
/trunk/extensions/CentralAuth:110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925-112926,112930,112993,113352,113926
/trunk/phase3/extensions/CentralAuth:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions/CentralAuth:100352-107913
/branches/REL1_15/phase3/extensions/CentralAuth:51646
/branches/REL1_17/phase3/extensions/CentralAuth:81445,81448
/branches/new-installer/phase3/extensions/CentralAuth:43664-66004
/branches/sqlite/extensions/CentralAuth:58211-58321
/branches/wmf/1.18wmf1/extensions/CentralAuth:97508
/trunk/extensions/CentralAuth:110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925-112926,112930,112993,113352,113926,114020
/trunk/phase3/extensions/CentralAuth:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified:
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
2012-03-16 16:17:27 UTC (rev 114020)
+++
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
2012-03-16 16:21:14 UTC (rev 114021)
@@ -416,8 +416,8 @@
*/
function formatMergeMethod( $method ) {
global $wgExtensionAssetsPath;
-
- $brief = wfMessage( 'centralauth-merge-method-{$method}'
)->text();
+
+ $brief = wfMessage( "centralauth-merge-method-{$method}"
)->text();
$html =
Html::element(
'img', array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
