From 53173d5fb311d6fa023e4181fcb1a06c58861776 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 10 Jun 2014 20:38:47 +0000 Subject: [PATCH] Revert "Revert "Officially deprecate skin autodiscovery"" The CI issue that made the revert necessary is fixed now. This reverts commit d672aa3123a612583ef9ec67115992aafce5b2af. Bug: 66429 Change-Id: Ib2b4a895c5d01e5ccc7e4edfdbfdcaf0a93c267c --- RELEASE-NOTES-1.24 | 3 +++ includes/Skin.php | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 05c66518c2..0779f6b198 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -151,6 +151,9 @@ changes to languages because of Bugzilla reports. * (bug 63755) The deprecated constants RC_MOVE and RC_MOVE_OVER_REDIRECT were removed. * Special:MostLinkedTemplates has been renamed to Special:MostTranscludedPages. +* The skin autodiscovery mechanism has been deprecated and will be removed in + MediaWiki 1.25. See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery + for migration guide for creators and users of custom skins that relied on it. ==== Renamed classes ==== * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression diff --git a/includes/Skin.php b/includes/Skin.php index 84dd3de09f..0d165fe04f 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -73,9 +73,19 @@ abstract class Skin extends ContextSource { // This is one of the reasons we should have never used autodiscovery in the first // place. This hack can be safely removed when autodiscovery is gone. if ( in_array( $aSkin, array( 'CologneBlue', 'Modern', 'MonoBook', 'Vector' ) ) ) { + wfLogWarning( + "An old copy of the $aSkin skin was found in your skins/ directory. " . + "You should remove it to avoid problems in the future." . + "See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for details." + ); continue; } + wfLogWarning( + "A skin using autodiscovery mechanism, $aSkin, was found in your skins/ directory. " . + "The mechanism will be removed in MediaWiki 1.25 and the skin will no longer be recognized. " . + "See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for information how to fix this." + ); $wgValidSkinNames[strtolower( $aSkin )] = $aSkin; } } -- 2.20.1