Merge "RCFilters: make live update part of the beta feature"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5b77d16..f9d2879 100644 (file)
--- 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 0762bf7..6114b31 100644 (file)
--- 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 e39be6c..d203328 100644 (file)
--- 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 ) );