From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 10 Jun 2014 20:38:47 +0000 (+0000)
Subject: Revert "Revert "Officially deprecate skin autodiscovery""
X-Git-Tag: 1.31.0-rc.0~15370
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=53173d5fb311d6fa023e4181fcb1a06c58861776;p=lhc%2Fweb%2Fwiklou.git

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
---

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;
 					}
 				}