jenkins-bot has submitted this change and it was merged.
Change subject: Deprecate defunct Skin::getCommonStylePath()
......................................................................
Deprecate defunct Skin::getCommonStylePath()
Change-Id: I5e4b870363ff885a4625c2d059048e85395fd159
---
M RELEASE-NOTES-1.24
M includes/skins/Skin.php
2 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index e13654e..7327294 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -455,6 +455,7 @@
* 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 7d04b95..d68823d 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1008,15 +1008,18 @@
}
/**
- * 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 '';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/159320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e4b870363ff885a4625c2d059048e85395fd159
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
