From 6bff3b462b2961fe4feb998b4220d6c00c4df629 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Sat, 2 Oct 2010 10:18:48 +0000 Subject: [PATCH] Bug 25338: fixed exception in Resource Loader --- includes/ResourceLoader.php | 3 +++ includes/ResourceLoaderContext.php | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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' ); -- 2.20.1