From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Mon, 13 Sep 2010 23:41:03 +0000 (+0000)
Subject: Wrapped custom loaders in a function which provides name, version and statically... 
X-Git-Tag: 1.31.0-rc.0~34943
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=1b97774d5e0e8ff3f5e8c7d1a457d58fbe08418f;p=lhc%2Fweb%2Fwiklou.git

Wrapped custom loaders in a function which provides name, version and statically defined dependencies for a module. This solves bug #25085.
---

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index 56437fb455..fdfac669d9 100644
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -149,7 +149,9 @@ class ResourceLoader {
 		foreach ( self::$modules as $name => $module ) {
 			// Support module loader scripts
 			if ( ( $loader = $module->getLoaderScript() ) !== false ) {
-				$scripts .= $loader;
+				$deps = json_encode( $module->getDependencies() );
+				$version = wfTimestamp( TS_ISO_8601, round( $module->getModifiedTime( $context ), -2 ) );
+				$scripts .= "( function( name, version, dependencies ) { $loader } )( '$name', '$version', $deps )";
 			}
 			// Automatically register module
 			else {