Merge "createAndPromote: use AuthManager::autoCreateUser"

[lhc/web/wiklou.git] / includes / changes / ChangesListBooleanFilter.php

diff --git a/includes/changes/ChangesListBooleanFilter.php b/includes/changes/ChangesListBooleanFilter.php
index f37ed2d..5bb1db9 100644 (file)
--- a/includes/changes/ChangesListBooleanFilter.php
+++ b/includes/changes/ChangesListBooleanFilter.php
@@ -29,13 +29,6 @@ use Wikimedia\Rdbms\IDatabase;
  * @since 1.29
  */
 class ChangesListBooleanFilter extends ChangesListFilter {
-       // This can sometimes be different on Special:RecentChanges
-       // and Special:Watchlist, due to the double-legacy hooks
-       // (SpecialRecentChangesFilters and SpecialWatchlistFilters)
-
-       // but there will be separate sets of ChangesListFilterGroup and ChangesListFilter instances
-       // for those pages (it should work even if they're both loaded
-       // at once, but that can't happen).
        /**
         * Main unstructured UI i18n key
         *
@@ -119,11 +112,7 @@ class ChangesListBooleanFilter extends ChangesListFilter {
                        $this->showHide = $filterDefinition['showHide'];
                }
 
-               if ( isset( $filterDefinition['isReplacedInStructuredUi'] ) ) {
-                       $this->isReplacedInStructuredUi = $filterDefinition['isReplacedInStructuredUi'];
-               } else {
-                       $this->isReplacedInStructuredUi = false;
-               }
+               $this->isReplacedInStructuredUi = $filterDefinition['isReplacedInStructuredUi'] ?? false;
 
                if ( isset( $filterDefinition['default'] ) ) {
                        $this->setDefault( $filterDefinition['default'] );
@@ -135,11 +124,7 @@ class ChangesListBooleanFilter extends ChangesListFilter {
                        $this->queryCallable = $filterDefinition['queryCallable'];
                }
 
-               if ( isset( $filterDefinition['activeValue'] ) ) {
-                       $this->activeValue = $filterDefinition['activeValue'];
-               } else {
-                       $this->activeValue = true;
-               }
+               $this->activeValue = $filterDefinition['activeValue'] ?? true;
        }
 
        /**
@@ -206,18 +191,15 @@ class ChangesListBooleanFilter extends ChangesListFilter {
                        return;
                }
 
-               call_user_func_array(
-                       $this->queryCallable,
-                       [
-                               get_class( $specialPage ),
-                               $specialPage->getContext(),
-                               $dbr,
-                               &$tables,
-                               &$fields,
-                               &$conds,
-                               &$query_options,
-                               &$join_conds
-                       ]
+               ( $this->queryCallable )(
+                       get_class( $specialPage ),
+                       $specialPage->getContext(),
+                       $dbr,
+                       $tables,
+                       $fields,
+                       $conds,
+                       $query_options,
+                       $join_conds
                );
        }