Merge "RC Filters: Disable defaults for legacy filters in structured UI"

diff --combined includes/specialpage/ChangesListSpecialPage.php
index 97d1dcb,d9472af..8e79703
--- 1/includes/specialpage/ChangesListSpecialPage.php
--- 2/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@@ -379,7 -379,7 +379,7 @@@ abstract class ChangesListSpecialPage e
                                                },
                                                'cssClassSuffix' => 'patrolled',
                                                'isRowApplicableCallable' => function ( $ctx, $rc ) {
 -                                                                                   return $rc->getAttribute( 'rc_patrolled' );
 +                                                      return $rc->getAttribute( 'rc_patrolled' );
                                                },
                                        ],
                                        [
@@@ -394,7 -394,7 +394,7 @@@
                                                },
                                                'cssClassSuffix' => 'unpatrolled',
                                                'isRowApplicableCallable' => function ( $ctx, $rc ) {
 -                                                                                   return !$rc->getAttribute( 'rc_patrolled' );
 +                                                      return !$rc->getAttribute( 'rc_patrolled' );
                                                },
                                        ],
                                ],
@@@ -707,6 -707,7 +707,7 @@@
        public function getDefaultOptions() {
                $config = $this->getConfig();
                $opts = new FormOptions();
+               $structuredUI = $this->getUser()->getOption( 'rcenhancedfilters' );
  
                // Add all filters
                foreach ( $this->filterGroups as $filterGroup ) {
@@@ -716,7 -717,7 +717,7 @@@
                                $opts->add( $filterGroup->getName(), $filterGroup->getDefault() );
                        } else {
                                foreach ( $filterGroup->getFilters() as $filter ) {
-                                       $opts->add( $filter->getName(), $filter->getDefault() );
+                                       $opts->add( $filter->getName(), $filter->getDefault( $structuredUI ) );
                                }
                        }
                }
@@@ -1169,9 -1170,9 +1170,9 @@@
                &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedExpLevels ) {
  
                global $wgLearnerEdits,
 -                         $wgExperiencedUserEdits,
 -                         $wgLearnerMemberSince,
 -                         $wgExperiencedUserMemberSince;
 +                      $wgExperiencedUserEdits,
 +                      $wgLearnerMemberSince,
 +                      $wgExperiencedUserMemberSince;
  
                $LEVEL_COUNT = 3;
  
@@@ -1207,7 -1208,7 +1208,7 @@@
                );
  
                if ( $selectedExpLevels === [ 'newcomer' ] ) {
 -                      $conds[] =  "NOT ( $aboveNewcomer )";
 +                      $conds[] = "NOT ( $aboveNewcomer )";
                } elseif ( $selectedExpLevels === [ 'learner' ] ) {
                        $conds[] = $dbr->makeList(
                                [ $aboveNewcomer, "NOT ( $aboveLearner )" ],