Revert "Officially deprecate skin autodiscovery"

The warnings interfere with Jenkins and stop code from being merged
where Jenkins is voting. See bug 66429 - we'll need to fix this before
merging this. Sorry!

This reverts commit 7fe6e4422467fa0c701f3ffb395e66de9cd0d67f.

Bug: 66429
Change-Id: I649462b0ccc22954ba4fbad8087dd55a7ad910bd

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index d67ceb5..b15ef6d 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -135,9 +135,6 @@ 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 0d165fe..84dd3de 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -73,19 +73,9 @@ 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;
                                        }
                                }