From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 29 Mar 2019 22:26:25 +0000 (-0700)
Subject: Avoid use of deprecated wikiId field in JobQueue
X-Git-Tag: 1.34.0-rc.0~2226^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=18dd14a05a1310dd8acae38bbf63fdc5f3213c2a;p=lhc%2Fweb%2Fwiklou.git

Avoid use of deprecated wikiId field in JobQueue

Change-Id: I9e30519e7985c20525572b685234ad239d62c214
---

diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php
index fdcd65cc9b..cb5cd82c21 100644
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@ -77,7 +77,7 @@ abstract class JobQueue {
 	 * Get a job queue object of the specified type.
 	 * $params includes:
 	 *   - class      : What job class to use (determines job type)
-	 *   - wiki       : wiki ID of the wiki the jobs are for (defaults to current wiki)
+	 *   - domain     : Database domain ID of the wiki the jobs are for (defaults to current wiki)
 	 *   - type       : The name of the job types this queue handles
 	 *   - order      : Order that pop() selects jobs, one of "fifo", "timestamp" or "random".
 	 *                  If "fifo" is used, the queue will effectively be FIFO. Note that job
diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php
index 328f2982f6..13111491a2 100644
--- a/includes/jobqueue/JobQueueGroup.php
+++ b/includes/jobqueue/JobQueueGroup.php
@@ -404,7 +404,7 @@ class JobQueueGroup {
 			$this->coalescedQueues = [];
 			foreach ( $wgJobTypeConf as $type => $conf ) {
 				$queue = JobQueue::factory(
-					[ 'wiki' => $this->domain, 'type' => 'null' ] + $conf );
+					[ 'domain' => $this->domain, 'type' => 'null' ] + $conf );
 				$loc = $queue->getCoalesceLocationInternal();
 				if ( !isset( $this->coalescedQueues[$loc] ) ) {
 					$this->coalescedQueues[$loc]['queue'] = $queue;