jenkins-bot has submitted this change and it was merged.
Change subject: Remove $wgAjaxWatch configuration variable
......................................................................
Remove $wgAjaxWatch configuration variable
This is now enabled by default.
We still check $wgUseAjax and $wgEnableWriteAPI, however.
Originally introduced in r18598 (69ea9bcf9b; MediaWiki 1.9.0; T9169).
Change-Id: I87b1926e727ae0870a0239d6e8ad87cc3a5ad72b
---
M RELEASE-NOTES-1.27
M includes/DefaultSettings.php
M includes/skins/Skin.php
M maintenance/dictionary/mediawiki.dic
4 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 2c64b2d..7d4ac3d 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -9,7 +9,7 @@
production.
=== Configuration changes in 1.27 ===
-* Removed $wgUseLinkNamespaceDBFields
+* $wgUseLinkNamespaceDBFields was removed.
* Deprecated $wgResourceLoaderMinifierStatementsOnOwnLine and
$wgResourceLoaderMinifierMaxLineLength, because there was little value in
making the behavior configurable. The default values (`false` for the former,
@@ -44,6 +44,7 @@
** A new constructor, User::newSystemUser(), has been added to simplify the
creation of passwordless "system" users for logged actions.
* $wgMaxSquidPurgeTitles was removed.
+* $wgAjaxWatch was removed. This is now enabled by default.
=== New features in 1.27 ===
* $wgDataCenterId and $wgDataCenterRoles where added, which will serve as
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7b196cb..8908f10 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7342,12 +7342,6 @@
$wgAjaxExportList = array();
/**
- * Enable watching/unwatching pages using AJAX.
- * Requires $wgUseAjax to be true too.
- */
-$wgAjaxWatch = true;
-
-/**
* Enable AJAX check for file overwrite, pre-upload
*/
$wgAjaxUploadDestCheck = true;
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 4e6201c..12ebb54 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -180,7 +180,7 @@
* @return array Array of modules with helper keys for easy overriding
*/
public function getDefaultModules() {
- global $wgUseAjax, $wgAjaxWatch, $wgEnableAPI,
$wgEnableWriteAPI;
+ global $wgUseAjax, $wgEnableAPI, $wgEnableWriteAPI;
$out = $this->getOutput();
$user = $out->getUser();
@@ -201,7 +201,7 @@
// Add various resources if required
if ( $wgUseAjax && $wgEnableAPI ) {
- if ( $wgEnableWriteAPI && $wgAjaxWatch &&
$user->isLoggedIn()
+ if ( $wgEnableWriteAPI && $user->isLoggedIn()
&& $user->isAllowedAll( 'writeapi',
'viewmywatchlist', 'editmywatchlist' )
&& $this->getRelevantTitle()->canExist()
) {
diff --git a/maintenance/dictionary/mediawiki.dic
b/maintenance/dictionary/mediawiki.dic
index 8e4e531..2322909 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -433,7 +433,6 @@
aiprop
airtel
aisort
-ajaxwatch
al
alefsym
algo
--
To view, visit https://gerrit.wikimedia.org/r/247729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87b1926e727ae0870a0239d6e8ad87cc3a5ad72b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
