Fix wpCreateAccount bug when set on Special:Block url params

[lhc/web/wiklou.git] / includes / jobqueue / aggregator / JobQueueAggregator.php

diff --git a/includes/jobqueue/aggregator/JobQueueAggregator.php b/includes/jobqueue/aggregator/JobQueueAggregator.php
index 433de93..b44fc45 100644 (file)
--- a/includes/jobqueue/aggregator/JobQueueAggregator.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregator.php
@@ -148,33 +148,12 @@ abstract class JobQueueAggregator {
                global $wgLocalDatabases;
 
                $pendingDBs = []; // (job type => (db list))
-               foreach ( $wgLocalDatabases as $db ) {
-                       foreach ( JobQueueGroup::singleton( $db )->getQueuesWithJobs() as $type ) {
-                               $pendingDBs[$type][] = $db;
+               foreach ( $wgLocalDatabases as $wikiId ) {
+                       foreach ( JobQueueGroup::singleton( $wikiId )->getQueuesWithJobs() as $type ) {
+                               $pendingDBs[$type][] = $wikiId;
                        }
                }
 
                return $pendingDBs;
        }
 }
-
-/**
- * @ingroup JobQueue
- */
-class JobQueueAggregatorNull extends JobQueueAggregator {
-       protected function doNotifyQueueEmpty( $wiki, $type ) {
-               return true;
-       }
-
-       protected function doNotifyQueueNonEmpty( $wiki, $type ) {
-               return true;
-       }
-
-       protected function doGetAllReadyWikiQueues() {
-               return [];
-       }
-
-       protected function doPurge() {
-               return true;
-       }
-}