From 434f280ba9b27c9f3e3b4dbeb9b260834913649d Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 16 Apr 2018 16:26:48 -0700 Subject: [PATCH] Deprecate $wgUseAjax in 1.31 This setting was intended to control the legacy AJAX framework, but some extensions mistakenly used it to control any AJAX functionality at all. But keeping this around when we're deprecating things like $wgEnableAPI makes no sense. [Retro-back-ported after bf61efd87 had landed in 1.32.] Change-Id: I7b767478f9fb44236e6514b0e83228d9fb8e856f --- RELEASE-NOTES-1.31 | 4 ++++ RELEASE-NOTES-1.32 | 2 +- includes/DefaultSettings.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index 9bdc32dd6c..d52d024875 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -39,6 +39,10 @@ production. * $wgValidateAllHtml was removed and will be ignored. * $wgScriptExtension was removed (deprecated and ignored since 1.25). See 1.25 release notes for more information. +* $wgUseAjax is now marked as deprecated, just like the deprecated AJAX + framework that it enables. Some extensions mistakenly used this to check + whether any AJAX functionality at all should be enabled, further making this + problematic to retain. === New features in 1.31 === * (T76554) User sub-pages named ….json are now protected in the same way that ….js diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index c9ebbfbf57..3be7609a5b 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -7,7 +7,7 @@ production. === Configuration changes in 1.32 === * (T115414) The $wgEnableAPI and $wgEnableWriteAPI settings, deprecated in 1.31, have been removed. -* The $wgUseAjax setting is now formally deprecated, and MediaWiki will act as if it is always set. +* The $wgUseAjax setting, deprecated in 1.31, is now ignored. * The $wgSiteSupportPage setting, unused since 1.5, was removed. * … diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 1ea9a420d8..9ab11b0562 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -8162,7 +8162,7 @@ $wgAPIUselessQueryPages = [ /** * Enable AJAX framework * - * @deprecated since MediaWiki 1.32 and ignored + * @deprecated (officially) since MediaWiki 1.31 and ignored since 1.32 */ $wgUseAjax = true; -- 2.20.1