From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 20 Dec 2017 19:08:02 +0000 (+0000)
Subject: Merge "RCFilters: Don't load JS or redirect when transcluding"
X-Git-Tag: 1.31.0-rc.0~1153
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=46fa949b8b5e10b1843d4ea2930679a0d3999025;hp=4c2cb9ac822d13c7aa418f9960657900e55ab909

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

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index eab5940de6..65a03eb767 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -631,7 +631,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 * redirect properly with all necessary query parameters.
 	 */
 	protected function considerActionsForDefaultSavedQuery() {
-		if ( !$this->isStructuredFilterUiEnabled() ) {
+		if ( !$this->isStructuredFilterUiEnabled() || $this->including() ) {
 			return;
 		}
 
@@ -704,7 +704,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 */
 	protected function includeRcFiltersApp() {
 		$out = $this->getOutput();
-		if ( $this->isStructuredFilterUiEnabled() ) {
+		if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
 			$jsData = $this->getStructuredFilterJsData();
 
 			$messages = [];
@@ -1649,7 +1649,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 		] );
 		$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' );
 		}