From 1cc49d300b92a82a61a2044de8ff5783f9b58815 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 13 Jun 2022 10:13:07 +1200 Subject: [PATCH] dev/core#3653 Fix on queue runner not working in upgrade --- CRM/Queue/Runner.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CRM/Queue/Runner.php b/CRM/Queue/Runner.php index 2d1eba96bb..1e9d1b2d7c 100644 --- a/CRM/Queue/Runner.php +++ b/CRM/Queue/Runner.php @@ -184,10 +184,16 @@ class CRM_Queue_Runner { public function runAllViaWeb() { $_SESSION['queueRunners'][$this->qrid] = serialize($this); $url = CRM_Utils_System::url($this->pathPrefix . '/runner', 'reset=1&qrid=' . urlencode($this->qrid)); - // If this was persistent/registered queue, ensure that no one else tries to execute it. - CRM_Core_DAO::executeQuery('UPDATE civicrm_queue SET status = NULL WHERE name = %1', [ - 1 => [$this->queue->getName(), 'String'], - ]); + try { + // If this was persistent/registered queue, ensure that no one else tries to execute it. + CRM_Core_DAO::executeQuery('UPDATE civicrm_queue SET status = NULL WHERE name = %1', [ + 1 => [$this->queue->getName(), 'String'], + ]); + } + catch (PEAR_Exception $e) { + // For sites being upgraded the field may not exist as yet. + // https://lab.civicrm.org/dev/core/-/issues/3653 + } CRM_Utils_System::redirect($url); } -- 2.25.1