From 7d127e31d60c1d9351bfa701bc2be27bbe9b22c7 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Fri, 12 Jul 2019 16:40:10 -0700 Subject: [PATCH] Hard-deprecate wgSkipSkin, deprecated in 1.23 Change-Id: Ia1013bea7216603f3b6a8148e0194f1e2a8e9b41 --- RELEASE-NOTES-1.34 | 2 ++ includes/Setup.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index ea46a7d3a8..c220f13515 100644 --- 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 45a2456c97..5b56dadbfb 100644 --- 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; } -- 2.20.1