Hard-deprecate wgSkipSkin, deprecated in 1.23

Change-Id: Ia1013bea7216603f3b6a8148e0194f1e2a8e9b41

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index ea46a7d..c220f13 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -52,6 +52,8 @@ For notes on 1.33.x and older releases, see HISTORY.
 * Introduced $wgVerifyMimeTypeIE to allow disabling the MSIE 6/7 file type
   detection heuristic on upload, which is more conservative than the checks
   that were changed above.
+* $wgSkipSkin — Setting this instead of $wgSkipSkins, deprecated in 1.23, is now
+  hard-deprecated.
 * …
 
 ==== Removed configuration ====

diff --git a/includes/Setup.php b/includes/Setup.php
index 45a2456..5b56dad 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -393,6 +393,8 @@ $wgDefaultUserOptions['watchlistdays'] = min(
 unset( $rcMaxAgeDays );
 
 if ( $wgSkipSkin ) {
+       // Hard deprecated in 1.34.
+       wfDeprecated( '$wgSkipSkin – use $wgSkipSkins instead', '1.23' );
        $wgSkipSkins[] = $wgSkipSkin;
 }