From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Fri, 1 Oct 2010 20:46:42 +0000 (+0000)
Subject: Removed double-encoding of dependencies and group for custom loader scripts.
X-Git-Tag: 1.31.0-rc.0~34699
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=aacab77ced617bcaeb5164d2b4701b4dfdea5eac;p=lhc%2Fweb%2Fwiklou.git

Removed double-encoding of dependencies and group for custom loader scripts.
---

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index e97a1af06e..13de97bc8c 100644
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -1060,8 +1060,8 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		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 );
 			}