X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueueDB.php;h=4be41a20e22c98a09ab7d5f8e60673b1f4dcd996;hb=7c9f1a122712362b5840aee0325e36b249cb79db;hp=f7b8ed2f78d41ec388a423ed81f2ae5da9bf6645;hpb=6cfb2e3d7a2b96d5041312fcec88248bb46573d7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index f7b8ed2f78..4be41a20e2 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -424,7 +424,7 @@ class JobQueueDB extends JobQueue {
 			if ( $dbw->getType() === 'mysql' ) {
 				// Per https://bugs.mysql.com/bug.php?id=6980, we can't use subqueries on the
 				// same table being changed in an UPDATE query in MySQL (gives Error: 1093).
-				// Oracle and Postgre have no such limitation. However, MySQL offers an
+				// Postgres has no such limitation. However, MySQL offers an
 				// alternative here by supporting ORDER BY + LIMIT for UPDATE queries.
 				$dbw->query( "UPDATE {$dbw->tableName( 'job' )} " .
 					"SET " .
@@ -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();