From: James D. Forrester <jforrester@wikimedia.org>
Date: Wed, 23 May 2018 21:56:13 +0000 (-0700)
Subject: Skin: Drop appending of wgStyleVersion in getSkinStylePath()
X-Git-Tag: 1.34.0-rc.0~5315^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=c1b4a3782768c9a8b1071d3ddd20fabe1bffaa24;p=lhc%2Fweb%2Fwiklou.git

Skin: Drop appending of wgStyleVersion in getSkinStylePath()

This setting is deprecated.

Bug: T181318
Change-Id: I9e56764e37b5f10ce1bddfb7826c18982fb1ebb2
---

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 5dfa7e36c3..252c08d124 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1095,25 +1095,25 @@ abstract class Skin extends ContextSource {
 	}
 
 	/**
-	 * Return a fully resolved style path url to images or styles stored in the current skins's folder.
-	 * This method returns a url resolved using the configured skin style path
-	 * and includes the style version inside of the url.
+	 * Return a fully resolved style path URL to images or styles stored in the
+	 * current skin's folder. This method returns a URL resolved using the
+	 * configured skin style path.
 	 *
 	 * Requires $stylename to be set, otherwise throws MWException.
 	 *
 	 * @param string $name The name or path of a skin resource file
-	 * @return string The fully resolved style path url including styleversion
+	 * @return string The fully resolved style path URL
 	 * @throws MWException
 	 */
 	function getSkinStylePath( $name ) {
-		global $wgStylePath, $wgStyleVersion;
+		global $wgStylePath;
 
 		if ( $this->stylename === null ) {
 			$class = static::class;
 			throw new MWException( "$class::\$stylename must be set to use getSkinStylePath()" );
 		}
 
-		return "$wgStylePath/{$this->stylename}/$name?$wgStyleVersion";
+		return "$wgStylePath/{$this->stylename}/$name";
 	}
 
 	/* these are used extensively in SkinTemplate, but also some other places */