Merge "RCFilters: Make 'lastRevision' filter include non-rev types"

diff --combined includes/specialpage/ChangesListSpecialPage.php
index b0a6ed6,d3be680..d7519d3
--- 1/includes/specialpage/ChangesListSpecialPage.php
--- 2/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@@ -84,6 -84,9 +84,9 @@@ abstract class ChangesListSpecialPage e
        public function __construct( $name, $restriction ) {
                parent::__construct( $name, $restriction );
  
+               $nonRevisionTypes = [ RC_LOG ];
+               Hooks::run( 'SpecialWatchlistGetNonRevisionTypes', [ &$nonRevisionTypes ] );
+ 
                $this->filterGroupDefinitions = [
                        [
                                'name' => 'registration',
@@@ -322,8 -325,14 +325,14 @@@
                                                'description' => 'rcfilters-filter-lastrevision-description',
                                                'default' => false,
                                                'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
-                                                       &$query_options, &$join_conds ) {
-                                                       $conds[] = 'rc_this_oldid <> page_latest';
+                                                       &$query_options, &$join_conds ) use ( $nonRevisionTypes ) {
+                                                       $conds[] = $dbr->makeList(
+                                                               [
+                                                                       'rc_this_oldid <> page_latest',
+                                                                       'rc_type' => $nonRevisionTypes,
+                                                               ],
+                                                               LIST_OR
+                                                       );
                                                },
                                                'cssClassSuffix' => 'last',
                                                'isRowApplicableCallable' => function ( $ctx, $rc ) {
@@@ -336,8 -345,14 +345,14 @@@
                                                'description' => 'rcfilters-filter-previousrevision-description',
                                                'default' => false,
                                                'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables, &$fields, &$conds,
-                                                       &$query_options, &$join_conds ) {
-                                                       $conds[] = 'rc_this_oldid = page_latest';
+                                                       &$query_options, &$join_conds ) use ( $nonRevisionTypes ) {
+                                                       $conds[] = $dbr->makeList(
+                                                               [
+                                                                       'rc_this_oldid = page_latest',
+                                                                       'rc_type' => $nonRevisionTypes,
+                                                               ],
+                                                               LIST_OR
+                                                       );
                                                },
                                                'cssClassSuffix' => 'previous',
                                                'isRowApplicableCallable' => function ( $ctx, $rc ) {
@@@ -600,7 -615,14 +615,7 @@@
                                )
                        );
  
 -                      $experimentalStructuredChangeFilters =
 -                              $this->getConfig()->get( 'StructuredChangeFiltersEnableExperimentalViews' );
 -
                        $out->addJsConfigVars( 'wgStructuredChangeFilters', $jsData['groups'] );
 -                      $out->addJsConfigVars(
 -                              'wgStructuredChangeFiltersEnableExperimentalViews',
 -                              $experimentalStructuredChangeFilters
 -                      );
  
                        $out->addJsConfigVars(
                                'wgRCFiltersChangeTags',
@@@ -617,11 -639,6 +632,11 @@@
                                ]
                        );
  
 +                      $out->addJsConfigVars(
 +                              'StructuredChangeFiltersLiveUpdatePollingRate',
 +                              $this->getConfig()->get( 'StructuredChangeFiltersLiveUpdatePollingRate' )
 +                      );
 +
                        if ( static::$savedQueriesPreferenceName ) {
                                $savedQueries = FormatJson::decode(
                                        $this->getUser()->getOption( static::$savedQueriesPreferenceName )