Merge "RCFilters: Don't load JS or redirect when transcluding"

diff --combined includes/specialpage/ChangesListSpecialPage.php
index eab5940,5993d10..65a03eb
--- 1/includes/specialpage/ChangesListSpecialPage.php
--- 2/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@@ -570,15 -570,8 +570,15 @@@ abstract class ChangesListSpecialPage e
                        // Used by "live update" and "view newest" to check
                        // if there's new changes with minimal data transfer
                        if ( $this->getRequest()->getBool( 'peek' ) ) {
 -                      $code = $rows->numRows() > 0 ? 200 : 204;
 +                              $code = $rows->numRows() > 0 ? 200 : 204;
                                $this->getOutput()->setStatusCode( $code );
 +
 +                              if ( $this->getUser()->isAnon() !==
 +                                      $this->getRequest()->getFuzzyBool( 'isAnon' )
 +                              ) {
 +                                      $this->getOutput()->setStatusCode( 205 );
 +                              }
 +
                                return;
                        }
  
@@@ -631,7 -624,7 +631,7 @@@
         * redirect properly with all necessary query parameters.
         */
        protected function considerActionsForDefaultSavedQuery() {
-               if ( !$this->isStructuredFilterUiEnabled() ) {
+               if ( !$this->isStructuredFilterUiEnabled() || $this->including() ) {
                        return;
                }
  
@@@ -704,7 -697,7 +704,7 @@@
         */
        protected function includeRcFiltersApp() {
                $out = $this->getOutput();
-               if ( $this->isStructuredFilterUiEnabled() ) {
+               if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
                        $jsData = $this->getStructuredFilterJsData();
  
                        $messages = [];
@@@ -1649,7 -1642,7 +1649,7 @@@
                ] );
                $out->addModules( 'mediawiki.special.changeslist.legend.js' );
  
-               if ( $this->isStructuredFilterUiEnabled() ) {
+               if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
                        $out->addModules( 'mediawiki.rcfilters.filters.ui' );
                        $out->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
                }