From d0e5057f37e4c6515601fc494068c42b01b9520d Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Fri, 12 Mar 2021 15:51:35 +0000
Subject: [PATCH] Drop $wgEnableRestAPI, deprecated in and ignored since 1.35

Change-Id: I2cfffb02d5ece67b3ddbbf4cb50e10e60d7ac7a1
---
 RELEASE-NOTES-1.36           | 1 +
 includes/DefaultSettings.php | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/RELEASE-NOTES-1.36 b/RELEASE-NOTES-1.36
index a4642a123ac..1a255fb8913 100644
--- a/RELEASE-NOTES-1.36
+++ b/RELEASE-NOTES-1.36
@@ -58,6 +58,7 @@ this is no longer recommended and the option has been removed.
   They became obsolete after 1.17 overhauled the database updater, but were kept
   for backwards compatibility. The LoadExtensionSchemaUpdates hook should be
   used instead.
+* $wgEnableRestAPI - This setting, ignored since 1.35, has been removed.
 * …
 
 === New user-facing features in 1.36 ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7717a3f00cb..87344188d4f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8831,14 +8831,6 @@ $wgAllowedCorsHeaders = [
 	'Access-Control-Max-Age',
 ];
 
-/**
- * Enable the experimental REST API.
- *
- * @deprecated Since 1.35, defaults to true and is ignored by MediaWiki core itself.
- *             No longer functions as a setting. Will be removed in 1.36.
- */
-$wgEnableRestAPI = true;
-
 /**
  * Additional REST API Route files.
  *