http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74107
Revision: 74107
Author: tparscal
Date: 2010-10-01 20:46:42 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
Removed double-encoding of dependencies and group for custom loader scripts.
Modified Paths:
--------------
trunk/phase3/includes/ResourceLoaderModule.php
Modified: trunk/phase3/includes/ResourceLoaderModule.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderModule.php 2010-10-01 20:42:05 UTC
(rev 74106)
+++ trunk/phase3/includes/ResourceLoaderModule.php 2010-10-01 20:46:42 UTC
(rev 74107)
@@ -1060,8 +1060,8 @@
foreach ( $context->getResourceLoader()->getModules() as $name
=> $module ) {
// Support module loader scripts
if ( ( $loader = $module->getLoaderScript() ) !== false
) {
- $deps = FormatJson::encode(
$module->getDependencies() );
- $group = FormatJson::encode(
$module->getGroup() );
+ $deps = $module->getDependencies();
+ $group = $module->getGroup();
$version = wfTimestamp( TS_ISO_8601_BASIC,
round( $module->getModifiedTime( $context ), -2 ) );
$out .= ResourceLoader::makeCustomLoaderScript(
$name, $version, $deps, $group, $loader );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
