https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113183
Revision: 113183
Author: catrope
Date: 2012-03-06 21:45:19 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
1.19wmf1: MFT r112926
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/CentralAuth/
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialWikiSets.php
Property changes on: branches/wmf/1.19wmf1/extensions/CentralAuth
___________________________________________________________________
Added: 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,112993
/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-06 21:35:03 UTC (rev 113182)
+++
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
2012-03-06 21:45:19 UTC (rev 113183)
@@ -26,7 +26,7 @@
$this->getOutput()->addModules( 'ext.centralauth' );
$this->getOutput()->addModuleStyles( 'ext.centralauth.noflash'
);
- $this->addMergeMethodDescriptions();
+ $this->getOutput()->addJsConfigVars(
'wgMergeMethodDescriptions', $this->getMergeMethodDescriptions() );
$this->mUserName =
trim(
@@ -701,15 +701,15 @@
return $total;
}
- function addMergeMethodDescriptions() {
- $js = "wgMergeMethodDescriptions = {\n";
+ function getMergeMethodDescriptions() {
+ $mergeMethodDescriptions = array();
foreach ( array( 'primary', 'new', 'empty', 'password', 'mail',
'admin', 'login' ) as $method ) {
- $short = Xml::encodeJsVar(
$this->getLanguage()->ucfirst( wfMsgHtml( "centralauth-merge-method-{$method}"
) ) );
- $desc = Xml::encodeJsVar( wfMsgWikiHtml(
"centralauth-merge-method-{$method}-desc" ) );
- $js .= "\t'{$method}' : { 'short' : {$short}, 'desc' :
{$desc} }\n";
+ $mergeMethodDescriptions[$method] = array(
+ 'short' => $this->getLanguage()->ucfirst(
wfMsgHtml( "centralauth-merge-method-{$method}" ) ),
+ 'desc' => wfMsgWikiHtml(
"centralauth-merge-method-{$method}-desc" )
+ );
}
- $js .= "}";
- $this->getOutput()->addInlineScript( $js );
+ return $mergeMethodDescriptions;
}
/**
Property changes on:
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialWikiSets.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php:81956
/trunk/extensions/CentralAuth/specials/SpecialWikiSets.php:112993
+ /branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php:81956
/trunk/extensions/CentralAuth/specials/SpecialWikiSets.php:112926,112993
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
