dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "RCFilters: Don't load JS or redirect when transcluding"
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
ChangesListSpecialPage.php
diff --git
a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index
eab5940
..
65a03eb
100644
(file)
--- 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() {
* redirect properly with all necessary query parameters.
*/
protected function considerActionsForDefaultSavedQuery() {
- if ( !$this->isStructuredFilterUiEnabled() ) {
+ if ( !$this->isStructuredFilterUiEnabled()
|| $this->including()
) {
return;
}
return;
}
@@
-704,7
+704,7
@@
abstract class ChangesListSpecialPage extends SpecialPage {
*/
protected function includeRcFiltersApp() {
$out = $this->getOutput();
*/
protected function includeRcFiltersApp() {
$out = $this->getOutput();
- if ( $this->isStructuredFilterUiEnabled() ) {
+ if ( $this->isStructuredFilterUiEnabled()
&& !$this->including()
) {
$jsData = $this->getStructuredFilterJsData();
$messages = [];
$jsData = $this->getStructuredFilterJsData();
$messages = [];
@@
-1649,7
+1649,7
@@
abstract class ChangesListSpecialPage extends SpecialPage {
] );
$out->addModules( 'mediawiki.special.changeslist.legend.js' );
] );
$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' );
}
$out->addModules( 'mediawiki.rcfilters.filters.ui' );
$out->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
}