http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72965
Revision: 72965
Author: maxsem
Date: 2010-09-14 11:58:09 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Follow-up r72941: don't use json_encode() directly
Modified Paths:
--------------
trunk/phase3/includes/ResourceLoader.php
Modified: trunk/phase3/includes/ResourceLoader.php
===================================================================
--- trunk/phase3/includes/ResourceLoader.php 2010-09-14 09:30:29 UTC (rev
72964)
+++ trunk/phase3/includes/ResourceLoader.php 2010-09-14 11:58:09 UTC (rev
72965)
@@ -149,7 +149,7 @@
foreach ( self::$modules as $name => $module ) {
// Support module loader scripts
if ( ( $loader = $module->getLoaderScript() ) !== false
) {
- $deps = json_encode( $module->getDependencies()
);
+ $deps = FormatJson::encode(
$module->getDependencies() );
$version = wfTimestamp( TS_ISO_8601, round(
$module->getModifiedTime( $context ), -2 ) );
$scripts .= "( function( name, version,
dependencies ) { $loader } )( '$name', '$version', $deps );";
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
