Hard-deprecate wgLocalInterwiki, deprecated in 1.23

Change-Id: Ib18c3122c4d9b8a50d314f67004cc73b8c14d40e

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index f1141ad..69b2088 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -54,6 +54,8 @@ For notes on 1.33.x and older releases, see HISTORY.
   that were changed above.
 * $wgSkipSkin — Setting this instead of $wgSkipSkins, deprecated in 1.23, is now
   hard-deprecated.
+* $wgLocalInterwiki — Setting this instead of $wgLocalInterwikis, deprecated in
+  1.23, is now hard-deprecated.
 * …
 
 ==== Removed configuration ====

diff --git a/includes/Setup.php b/includes/Setup.php
index 5b56dad..71136e0 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -402,6 +402,8 @@ $wgSkipSkins[] = 'fallback';
 $wgSkipSkins[] = 'apioutput';
 
 if ( $wgLocalInterwiki ) {
+       // Hard deprecated in 1.34.
+       wfDeprecated( '$wgLocalInterwiki – use $wgLocalInterwikis instead', '1.23' );
        array_unshift( $wgLocalInterwikis, $wgLocalInterwiki );
 }