From 4235d5abf09650ff9bcbb153299858f9dc4e988b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 9 Sep 2014 17:26:23 +0200 Subject: [PATCH] Deprecate defunct Skin::getCommonStylePath() Change-Id: I5e4b870363ff885a4625c2d059048e85395fd159 --- RELEASE-NOTES-1.24 | 1 + includes/skins/Skin.php | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index e13654e4fc..73272945bb 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -455,6 +455,7 @@ changes to languages because of Bugzilla reports. * LCStoreAccel was removed. $wgLocalisationCacheConf can no longer be set to use this store class. * Html::infoBox() no longer accepts paths relative to skins/common/images/. +* Deprecated defunct Skin::getCommonStylePath(). ==== Renamed classes ==== * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php index 7d04b9551f..d68823db3b 100644 --- a/includes/skins/Skin.php +++ b/includes/skins/Skin.php @@ -1008,15 +1008,18 @@ 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. + * This function previously returned a fully resolved style path URL to images or styles stored in + * the legacy skins/common/ directory. + * + * That directory has been removed in 1.24 and the function always returns an empty string. + * + * @deprecated since 1.24 * @param string $name The name or path of a skin resource file - * @return string The fully resolved style path url including styleversion + * @return string Empty string */ function getCommonStylePath( $name ) { - global $wgStylePath, $wgStyleVersion; - return "$wgStylePath/common/$name?$wgStyleVersion"; + wfDeprecated( __METHOD__, '1.24' ); + return ''; } /** -- 2.20.1