Merge "RCFilters: remove wgStructuredChangeFiltersEnableExperimentalViews"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5630dcb..27f95ad 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6812,14 +6812,6 @@ $wgUseRCPatrol = true;
  */
 $wgStructuredChangeFiltersShowPreference = false;
 
-/**
- * Whether to show the new experimental views (like namespaces, tags, and users) in
- * RecentChanges filters
- *
- * Temporary variable during development and will be removed.
- */
-$wgStructuredChangeFiltersEnableExperimentalViews = false;
-
 /**
  * Whether to enable RCFilters app on Special:Watchlist
  *

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index dd0dd92..cf6c8e3 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -600,14 +600,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                                )
                        );
 
-                       $experimentalStructuredChangeFilters =
-                               $this->getConfig()->get( 'StructuredChangeFiltersEnableExperimentalViews' );
-
                        $out->addJsConfigVars( 'wgStructuredChangeFilters', $jsData['groups'] );
-                       $out->addJsConfigVars(
-                               'wgStructuredChangeFiltersEnableExperimentalViews',
-                               $experimentalStructuredChangeFilters
-                       );
 
                        $out->addJsConfigVars(
                                'wgRCFiltersChangeTags',

diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
index 58e4d29..4eec02a 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
@@ -213,9 +213,6 @@
                        'group2filter5-desc': 'Description of Filter 5 in Group 2',
                        'group2filter6-label': 'xGroup 2: Filter 6',
                        'group2filter6-desc': 'Description of Filter 6 in Group 2'
-               },
-               config: {
-                       wgStructuredChangeFiltersEnableExperimentalViews: true
                }
        } ) );