From 39ec2dd84bcd39ad3d485b823b01cf8c88778bba Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 3 Aug 2019 22:45:48 +0100 Subject: [PATCH] OutputPage: Remove 'html5shiv' module from RL registration Follows-up 66a011797d8e2fd, which changed the reference to this JS file to be without the indirection of ResourceLoader. It's been deployed well over the needed 7 days, so this can be removed now. Change-Id: I823c0b31c4478e5e34f4191d851b6a9c83a6019b --- includes/OutputPage.php | 4 ++-- resources/Resources.php | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index e78cd7bd12..2c7292c1b2 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3047,8 +3047,8 @@ class OutputPage extends ContextSource { // This library is intended to run on older browsers that MediaWiki no longer // supports as Grade A. For these Grade C browsers, we provide an experience - // using only HTML and CSS. Where standards-compliant browsers are able to style - // unknown HTML elements without issue, old IE ignores these styles. + // using only HTML and CSS. But, where standards-compliant browsers are able to + // style unknown HTML elements without issue, old IE ignores these styles. // The html5shiv library fixes that. // Use an IE conditional comment to serve the script only to old IE $shivUrl = $config->get( 'ResourceBasePath' ) . '/resources/lib/html5shiv/html5shiv.js'; diff --git a/resources/Resources.php b/resources/Resources.php index 133ba0f4ea..68188f08de 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2820,13 +2820,6 @@ return [ ], ], - // @todo FIXME: Remove 7 days after Ib0020b6bd0156 is deployed to all wikis. - 'html5shiv' => [ - 'scripts' => [ - 'resources/lib/html5shiv/html5shiv.js' - ], - ], - /* EasyDeflate */ 'easy-deflate.core' => [ -- 2.20.1