From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Mon, 26 May 2014 13:54:56 +0000 (+0200)
Subject: Officially deprecate skin autodiscovery
X-Git-Tag: 1.31.0-rc.0~15423
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=7fe6e4422467fa0c701f3ffb395e66de9cd0d67f;p=lhc%2Fweb%2Fwiklou.git

Officially deprecate skin autodiscovery

Corresponding change in REL1_23 (different, because core skins still use
autodiscovery in that version): If9125ef587ce11f0d69f12eacd00ae7236139798.

Bug: 65748
Change-Id: I6fc30f97d4b35820c132c4892abf6d2c86f9482e
---

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index b15ef6d071..d67ceb5421 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -135,6 +135,9 @@ changes to languages because of Bugzilla reports.
 * (bug 63891) Add 'X-Robots-Tag: noindex' header in action=render pages.
 * SpecialPage no longer supports the syntax for invoking wfSpecial*() functions.
   All special pages should subclass SpecialPage and implement the execute() method.
+* 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;
 					}
 				}