From: Timo Tijhof <ttijhof@wikimedia.org>
Date: Fri, 29 Jun 2012 08:40:28 +0000 (+0200)
Subject: ResourceLoader.php: Fix E_NOTICE
X-Git-Tag: 1.31.0-rc.0~23192
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=a2ec7c7aba0644753abe56c50ee3e3b499a62df4;p=lhc%2Fweb%2Fwiklou.git

ResourceLoader.php: Fix E_NOTICE

* Follows-up d3286132461554a949d11e07bfba2aaea025608a

Change-Id: Idc2da99c941047a3f5e345457fd7b71cdf417257
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 93dac7b60b..8b1452edfb 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -752,7 +752,11 @@ class ResourceLoader {
 						}
 						break;
 					case 'styles':
-						$out .= $styles['']; // Code above has set $styles['']
+						// We no longer seperate into media, they are all concatenated now with
+						// custom media type groups into @media .. {} sections.
+						// Module returns either an empty array or an array with '' (no media type) as
+						// only key.
+						$out .= isset( $styles[''] ) ? $styles[''] : '';
 						break;
 					case 'messages':
 						$out .= self::makeMessageSetScript( new XmlJsCode( $messagesBlob ) );