Bug 25338: fixed exception in Resource Loader

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index aa7685b..7935ada 100644 (file)
--- 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 1dca623..ca2332e 100644 (file)
--- 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' );