RCFilters: Don't let new params filter out old page

Bug: T177884
Change-Id: Id0ace30b837cf6c5fa7159aa40d80392187c4e16

diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php b/includes/changes/ChangesListStringOptionsFilterGroup.php
index 59efd82..2d1521d 100644 (file)
--- a/includes/changes/ChangesListStringOptionsFilterGroup.php
+++ b/includes/changes/ChangesListStringOptionsFilterGroup.php
@@ -242,4 +242,14 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup {
 
                return $output;
        }
+
+       /**
+        * Check if this filter group is currently active
+        *
+        * @param {boolean} $isStructuredUI Is structured filters UI current enabled
+        */
+       public function isActive( $isStructuredUI ) {
+               // STRING_OPTIONS filter groups are exclusively active on Structured UI
+               return $isStructuredUI;
+       }
 }

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 20fd06a..3f45250 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -1295,8 +1295,10 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                        // URL parameters can be per-group, like 'userExpLevel',
                        // or per-filter, like 'hideminor'.
                        if ( $filterGroup->isPerGroupRequestParameter() ) {
-                               $filterGroup->modifyQuery( $dbr, $this, $tables, $fields, $conds,
-                                       $query_options, $join_conds, $opts[$filterGroup->getName()] );
+                               if ( $filterGroup->isActive( $isStructuredUI ) ) {
+                                       $filterGroup->modifyQuery( $dbr, $this, $tables, $fields, $conds,
+                                               $query_options, $join_conds, $opts[$filterGroup->getName()] );
+                               }
                        } else {
                                foreach ( $filterGroup->getFilters() as $filter ) {
                                        if ( $filter->isActive( $opts, $isStructuredUI ) ) {

diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
index d967588..5a0834a 100644 (file)
--- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
+++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
@@ -15,6 +15,13 @@ use Wikimedia\TestingAccessWrapper;
  * @covers ChangesListSpecialPage
  */
 class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase {
+       public function setUp() {
+               parent::setUp();
+               $this->setMwGlobals( [
+                       'wgStructuredChangeFiltersShowPreference' => true,
+               ] );
+       }
+
        protected function getPage() {
                $mock = $this->getMockBuilder( ChangesListSpecialPage::class )
                        ->setConstructorArgs(