Merge "RCFilters: Move parameter operations to ViewModel"

[lhc/web/wiklou.git] / includes / specialpage / ChangesListSpecialPage.php

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index df6a1c1..3f45250 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -629,7 +629,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                        if ( $savedQueries && isset( $savedQueries[ 'default' ] ) ) {
                                // Only load queries that are 'version' 2, since those
                                // have parameter representation
-                               if ( $savedQueries[ 'version' ] === '2' ) {
+                               if ( isset( $savedQueries[ 'version' ] ) && $savedQueries[ 'version' ] === '2' ) {
                                        $savedQueryDefaultID = $savedQueries[ 'default' ];
                                        $defaultQuery = $savedQueries[ 'queries' ][ $savedQueryDefaultID ][ 'data' ];
 
@@ -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 ) ) {