From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 9 Feb 2012 10:42:53 +0000 (+0000)
Subject: Explanatory comment for r111023
X-Git-Tag: 1.31.0-rc.0~24838
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=ec3c223b7bb4ab4b39e69e994fe0f9f2950c05a2;p=lhc%2Fweb%2Fwiklou.git

Explanatory comment for r111023
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c6d3680377..781aa61581 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2681,6 +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 );