From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 31 Jul 2019 02:22:43 +0000 (-0400)
Subject: Cleanup JobQueueDB::recycleAndDeleteStaleJobs() use of IDatabase::affectedRows()
X-Git-Tag: 1.34.0-rc.0~743^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=97cbaa349e2204211cc3a864d00209b5d2c9b03e;p=lhc%2Fweb%2Fwiklou.git

Cleanup JobQueueDB::recycleAndDeleteStaleJobs() use of IDatabase::affectedRows()

Bug: T229456
Change-Id: Ie22085ddba66f122e59e93baaf9b53c76b5ce448
---

diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index f7b8ed2f78..d449e8a259 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -690,9 +690,9 @@ class JobQueueDB extends JobQueue {
 					$dbw->update( 'job',
 						[
 							'job_token' => '',
-							'job_token_timestamp' => $dbw->timestamp( $now ) ], // time of release
-						[
-							'job_id' => $ids ],
+							'job_token_timestamp' => $dbw->timestamp( $now ) // time of release
+						],
+						[ 'job_id' => $ids, "job_token != ''" ],
 						__METHOD__
 					);
 					$affected = $dbw->affectedRows();