From: Ori.livneh <ori@wikimedia.org>
Date: Thu, 27 Aug 2015 17:02:11 +0000 (+0000)
Subject: Revert "Load all CSS in the top queue"
X-Git-Tag: 1.31.0-rc.0~10244^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=9866d6ee08ab2a49143376b468c1a15410d85d89;p=lhc%2Fweb%2Fwiklou.git

Revert "Load all CSS in the top queue"

I don't want to roll this out until our WebPageTest infrastructure is ready
and can show whether or not this is beneficial. I should have indicated this
clearly on the change rather than leave it open, sorry.

This reverts commit b7c0e537ebb7216cd12a6c48fbaee7c2c7757c55.

Change-Id: I43e3295873a94da1c2febe2c1a19ad20ca914254
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 80fd9aba41..8d4720b610 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3073,6 +3073,10 @@ class OutputPage extends ContextSource {
 			ResourceLoaderModule::TYPE_SCRIPTS
 		);
 
+		$links[] = $this->makeResourceLoaderLink( $this->getModuleStyles( true, 'bottom' ),
+			ResourceLoaderModule::TYPE_STYLES
+		);
+
 		// Modules requests - let the client calculate dependencies and batch requests as it likes
 		// Only load modules that have marked themselves for loading at the bottom
 		$modules = $this->getModules( true, 'bottom' );
@@ -3664,7 +3668,7 @@ class OutputPage extends ContextSource {
 		$otherTags = array(); // Tags to append after the normal <link> tags
 		$resourceLoader = $this->getResourceLoader();
 
-		$moduleStyles = $this->getModuleStyles( true );
+		$moduleStyles = $this->getModuleStyles( true, 'top' );
 
 		// Per-site custom styles
 		$moduleStyles[] = 'site';