From ceb02fbf9af0c5bd69580c3d0072b5cb26687512 Mon Sep 17 00:00:00 2001
From: Stephane Bisson <sbisson@wikimedia.org>
Date: Wed, 13 Sep 2017 16:07:54 -0400
Subject: [PATCH] RCFilters: make live update part of the beta feature

Cleanup wgStructuredChangeFiltersEnableLiveUpdate

Bug: T175766
Change-Id: I03db105bef6c3730221c2d00ce56afb2c78bf57c
---
 includes/DefaultSettings.php                      | 7 -------
 includes/specialpage/ChangesListSpecialPage.php   | 4 ----
 resources/src/mediawiki.rcfilters/mw.rcfilters.js | 2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5b77d16c4e..f9d2879fef 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6850,13 +6850,6 @@ $wgStructuredChangeFiltersShowPreference = false;
  */
 $wgStructuredChangeFiltersEnableExperimentalViews = false;
 
-/**
- * Whether to allow users to use the experimental live update feature in the new RecentChanges UI
- *
- * Temporary variable during development and will be removed.
- */
-$wgStructuredChangeFiltersEnableLiveUpdate = false;
-
 /**
  * Whether to enable RCFilters app on Special:Watchlist
  *
diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 0762bf7f8d..6114b31095 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -602,10 +602,6 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 				'wgStructuredChangeFiltersEnableExperimentalViews',
 				$experimentalStructuredChangeFilters
 			);
-			$out->addJsConfigVars(
-				'wgStructuredChangeFiltersEnableLiveUpdate',
-				$this->getConfig()->get( 'StructuredChangeFiltersEnableLiveUpdate' )
-			);
 			$out->addJsConfigVars(
 				'wgRCFiltersChangeTags',
 				$this->buildChangeTagList()
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
index e39be6c4db..d2033289b5 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
@@ -47,7 +47,7 @@
 		},
 		featureFlags: {
 			liveUpdate: mw.config.get( 'wgStructuredChangeFiltersLiveUpdateSupported' ) &&
-				( mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) || new mw.Uri().query.liveupdate )
+				( mw.user.options.get( 'rcenhancedfilters' ) || new mw.Uri().query.liveupdate )
 		}
 	};
 }( mediaWiki ) );
-- 
2.20.1