From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Mon, 13 Sep 2010 19:36:09 +0000 (+0000)
Subject: Fixed bug #25147, a regression caused by r72743, where one of the type checks for... 
X-Git-Tag: 1.31.0-rc.0~34947
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=9752437827fefd8fd241bf6b7c2d1fd01e18c282;p=lhc%2Fweb%2Fwiklou.git

Fixed bug #25147, a regression caused by r72743, where one of the type checks for the style argument of mediaWiki.loader.implement did not get changed to accept objects as well as strings.
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 56d8f94c12..215e0abb06 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -560,7 +560,7 @@ window.mediaWiki = new ( function( $ ) {
 			registry[module].state = 'loaded';
 			// Attach components
 			registry[module].script = script;
-			if ( typeof style === 'string' ) {
+			if ( typeof style === 'string' || typeof style === 'object' ) {
 				registry[module].style = style;
 			}
 			if ( typeof localization === 'object' ) {