From: James D. Forrester <jforrester@wikimedia.org>
Date: Fri, 12 Jul 2019 23:40:51 +0000 (-0700)
Subject: Hard-deprecate wgLocalInterwiki, deprecated in 1.23
X-Git-Tag: 1.34.0-rc.0~980
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=be07389e2af93d584594e8ac8c41040ab0d752e5;p=lhc%2Fweb%2Fwiklou.git

Hard-deprecate wgLocalInterwiki, deprecated in 1.23

Change-Id: Ib18c3122c4d9b8a50d314f67004cc73b8c14d40e
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index f1141adc7e..69b2088125 100644
--- 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 5b56dadbfb..71136e050b 100644
--- 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 );
 }