From: James D. Forrester <jforrester@wikimedia.org>
Date: Mon, 5 Feb 2018 17:37:41 +0000 (-0800)
Subject: Follow-up ed76b6736: Also remove the now-unused $mExtStyles
X-Git-Tag: 1.31.0-rc.0~694^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=b0689e79293e764d81bfffd5d76e592420e7f0f0;p=lhc%2Fweb%2Fwiklou.git

Follow-up ed76b6736: Also remove the now-unused $mExtStyles

Change-Id: I7622ba15b03df97213acd82e4a3fa78267a30d55
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index b46d3d60ab..23f1e44a54 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -211,6 +211,8 @@ changes to languages because of Phabricator reports.
   * OutputPage::setSquidMaxage(); deprecated in 1.27
   * OutputPage::readOnlyPage(); deprecated in 1.25
   * OutputPage::rateLimited(); deprecated in 1.25
+  * Additionally, the protected OutputPage::$mExtStyles array, only accessed through
+    the above and with no known uses, was removed.
 * The no-op method Skin::showIPinHeader(), deprecated in 1.27, was removed.
 * \ObjectFactory (no namespace) is deprecated, the namespaced \Wikimedia\ObjectFactory
   from the wikimedia/object-factory library should be used instead.
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5fa66e8c96..e6345ba7ec 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -52,12 +52,6 @@ class OutputPage extends ContextSource {
 	/** @var bool */
 	protected $mCanonicalUrl = false;
 
-	/**
-	 * @var array Additional stylesheets. Looks like this is for extensions.
-	 *   Might be replaced by ResourceLoader.
-	 */
-	protected $mExtStyles = [];
-
 	/**
 	 * @var string Should be private - has getter and setter. Contains
 	 *   the HTML title */
@@ -3643,12 +3637,6 @@ class OutputPage extends ContextSource {
 	public function buildCssLinksArray() {
 		$links = [];
 
-		// Add any extension CSS
-		foreach ( $this->mExtStyles as $url ) {
-			$this->addStyle( $url );
-		}
-		$this->mExtStyles = [];
-
 		foreach ( $this->styles as $file => $options ) {
 			$link = $this->styleLink( $file, $options );
 			if ( $link ) {