http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74139
Revision: 74139
Author: maxsem
Date: 2010-10-02 10:18:48 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
Bug 25338: fixed exception in Resource Loader
Modified Paths:
--------------
trunk/phase3/includes/ResourceLoader.php
trunk/phase3/includes/ResourceLoaderContext.php
Modified: trunk/phase3/includes/ResourceLoader.php
===================================================================
--- trunk/phase3/includes/ResourceLoader.php 2010-10-02 08:55:39 UTC (rev
74138)
+++ trunk/phase3/includes/ResourceLoader.php 2010-10-02 10:18:48 UTC (rev
74139)
@@ -44,6 +44,9 @@
* @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();
Modified: trunk/phase3/includes/ResourceLoaderContext.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderContext.php 2010-10-02 08:55:39 UTC
(rev 74138)
+++ trunk/phase3/includes/ResourceLoaderContext.php 2010-10-02 10:18:48 UTC
(rev 74139)
@@ -50,7 +50,8 @@
$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' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
