Follow-up 658af7f47: Use ignoreHidden for rcenhancedfilters
authorRoan Kattouw <roan.kattouw@gmail.com>
Wed, 1 Mar 2017 22:59:30 +0000 (14:59 -0800)
committerRoan Kattouw <roan.kattouw@gmail.com>
Wed, 1 Mar 2017 22:59:30 +0000 (14:59 -0800)
As we do in addModules() as well. Also move the addModuleStyles
call down to addModules().

Change-Id: I537705bbf5a05ed5c1b7a0133845bcd631547f92

includes/specials/SpecialRecentchanges.php

index a2e643b..73a209b 100644 (file)
@@ -456,8 +456,12 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                $panelString = implode( "\n", $panel );
 
                // Insert a placeholder for RCFilters
-               if ( $this->getUser()->getOption( 'rcenhancedfilters' ) ) {
-                       $this->getOutput()->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
+               if ( $this->getUser()->getOption(
+                               'rcenhancedfilters',
+                               /*default=*/ null,
+                               /*ignoreHidden=*/ true
+                       )
+               ) {
                        $this->getOutput()->addHTML(
                                Html::element(
                                        'div',
@@ -544,6 +548,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                        )
                ) {
                        $out->addModules( 'mediawiki.rcfilters.filters.ui' );
+                       $out->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
                }
        }