From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 2 Oct 2010 10:18:48 +0000 (+0000)
Subject: Bug 25338: fixed exception in Resource Loader
X-Git-Tag: 1.31.0-rc.0~34678
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=6bff3b462b2961fe4feb998b4220d6c00c4df629;p=lhc%2Fweb%2Fwiklou.git

Bug 25338: fixed exception in Resource Loader
---

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index aa7685bbb6..7935adab51 100644
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -44,6 +44,9 @@ class ResourceLoader {
 	 * @param $context ResourceLoaderContext context to load the information within
 	 */
 	protected function preloadModuleInfo( array $modules, ResourceLoaderContext $context ) {
+		if ( !count( $modules ) ) {
+			return; # or Database*::select() will explode
+		}
 		$dbr = wfGetDb( DB_SLAVE );
 		$skin = $context->getSkin();
 		$lang = $context->getLanguage();
diff --git a/includes/ResourceLoaderContext.php b/includes/ResourceLoaderContext.php
index 1dca623e66..ca2332eb9c 100644
--- a/includes/ResourceLoaderContext.php
+++ b/includes/ResourceLoaderContext.php
@@ -50,7 +50,8 @@ class ResourceLoaderContext {
 		$this->resourceLoader = $resourceLoader;
 		$this->request = $request;
 		// Interperet request
-		$this->modules = explode( '|', $request->getVal( 'modules' ) );
+		$modules = $request->getVal( 'modules' );
+		$this->modules = $modules ? explode( '|', $modules ) : array();
 		$this->language = $request->getVal( 'lang' );
 		$this->direction = $request->getVal( 'dir' );
 		$this->skin = $request->getVal( 'skin' );