From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 9 Feb 2012 10:59:52 +0000 (+0000)
Subject: Revert r111023 and r111024, they broke user.options . I'll fix this properly by split... 
X-Git-Tag: 1.31.0-rc.0~24836
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=595f852f8c4001b4a5e72b86b5230b983e94dd40;p=lhc%2Fweb%2Fwiklou.git

Revert r111023 and r111024, they broke user.options . I'll fix this properly by splitting user.options's CSS part into a separate module; I've apparently known this was needed since r93363
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 781aa61581..cc9118af52 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2681,10 +2681,8 @@ $templates
 		);
 
 		// Load embeddable private modules before any loader links
-		// Per bug 34289, this needs to be TYPE_SCRIPTS. Using TYPE_COMBINED
-		// causes the user.options CSS to be loaded twice.
 		$embedScripts = array( 'user.options', 'user.tokens' );
-		$scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_SCRIPTS );
+		$scripts .= $this->makeResourceLoaderLink( $embedScripts, ResourceLoaderModule::TYPE_COMBINED );
 
 		// Script and Messages "only" requests marked for top inclusion
 		// Messages should go first