From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 1 Jun 2011 13:51:50 +0000 (+0000)
Subject: (bug 29224) Also use a packed modules string for the startup modules (usually there... 
X-Git-Tag: 1.31.0-rc.0~29807
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=674e20d91f8c65e52364a53f3aa558b1ae54e68f;p=lhc%2Fweb%2Fwiklou.git

(bug 29224) Also use a packed modules string for the startup modules (usually there's only one, but there's a hook to add more)
---

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 63971f9982..dc3dbdfda9 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -185,7 +185,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			}
 			// Build load query for StartupModules 
 			$query = array(
-				'modules' => implode( '|',  $modules ),
+				'modules' => ResourceLoader::makePackedModulesString( $modules ),
 				'only' => 'scripts',
 				'lang' => $context->getLanguage(),
 				'skin' => $context->getSkin(),