From: Krinkle <ttijhof@wikimedia.org>
Date: Sat, 16 Jun 2012 04:03:40 +0000 (+0000)
Subject: Revert "Deprecate no longer used Skin::getCommonStylePath."
X-Git-Tag: 1.31.0-rc.0~23300^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=baffcddf516f070bd89af3cbfb61d79bd2d68382;p=lhc%2Fweb%2Fwiklou.git

Revert "Deprecate no longer used Skin::getCommonStylePath."

This reverts commit 79dcf7686d857e1dcbc3f1127a106d847de10d9e
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index f8af88a2e9..350b6b9938 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -154,7 +154,6 @@ changes to languages because of Bugzilla reports.
 * Removed ./tests/qunit/index.html from core. It wasn't actively maintained and
   has been made obsolete when [[Special:JavaScriptTest/qunit]] was introduced,
   which actually uses ResourceLoader, LocalSettings and the Skin.
-* Skin::getCommonStylePath has been deprecated. Its use is obsolete.
 
 == Compatibility ==
 
diff --git a/includes/Skin.php b/includes/Skin.php
index a2d5e0ffc1..8d47b83d0f 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1033,16 +1033,11 @@ abstract class Skin extends ContextSource {
 	 * Return a fully resolved style path url to images or styles stored in the common folder.
 	 * This method returns a url resolved using the configured skin style path
 	 * and includes the style version inside of the url.
-	 * @deprecated since 1.20: obsolete
-	 *
 	 * @param $name String: The name or path of a skin resource file
 	 * @return String The fully resolved style path url including styleversion
 	 */
 	function getCommonStylePath( $name ) {
 		global $wgStylePath, $wgStyleVersion;
-
-		wfDeprecated( __METHOD__, '1.20' );
-
 		return "$wgStylePath/common/$name?$wgStyleVersion";
 	}