From f8ffc44c98b17f281463752cee5ed92c83cbb187 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Mon, 8 Apr 2019 18:41:45 +0200
Subject: [PATCH] Fix IE conditional comment

47422fabe2813fb12b7663257924fdf4cd7cd0d1 broke the IE conditional
comment. This is change restores them.

Change-Id: I397434e9c23506080fe5507b29c2cc48e2f078c7
---
 includes/OutputPage.php                           | 5 ++++-
 includes/resourceloader/ResourceLoaderContext.php | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index cb3f1ad203..b0000ab027 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3223,7 +3223,10 @@ class OutputPage extends ContextSource {
 		// Use an IE conditional comment to serve the script only to old IE
 		$pieces[] = '<!--[if lt IE 9]>' .
 			ResourceLoaderClientHtml::makeLoad(
-				ResourceLoaderContext::newDummyContext(),
+				new ResourceLoaderContext(
+					$this->getResourceLoader(),
+					new FauxRequest( [] )
+				),
 				[ 'html5shiv' ],
 				ResourceLoaderModule::TYPE_SCRIPTS,
 				[ 'sync' => true ],
diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index f11f294f9b..372d12dd85 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -132,7 +132,6 @@ class ResourceLoaderContext implements MessageLocalizer {
 	 * things that don't "really" need a context.
 	 *
 	 * Use cases:
-	 * - Creating html5shiv script tag in OutputPage.
 	 * - Unit tests (deprecated, create empty instance directly or use RLTestCase).
 	 *
 	 * @return ResourceLoaderContext
-- 
2.20.1