Fix queue runner not progressing

diff --git a/CRM/Queue/Queue/Memory.php b/CRM/Queue/Queue/Memory.php
index 7fd1ab6ae211f811a6f9776a906750c02fba524b..ad0bfd8ffdb66b801df5ff9a3648e0db8b1ffcec 100644 (file)
--- a/CRM/Queue/Queue/Memory.php
+++ b/CRM/Queue/Queue/Memory.php
@@ -114,7 +114,7 @@ class CRM_Queue_Queue_Memory extends CRM_Queue_Queue {
    *
    * @return int
    */
-  public function numberOfItems() {
+  public function numberOfItems(): int {
     return count($this->items);
   }
 

diff --git a/CRM/Queue/Queue/SqlTrait.php b/CRM/Queue/Queue/SqlTrait.php
index 886eafa0c323e731f799efbb7008c231976f45bd..8e191131e4d152f4e86e6c286f302c3954aae033 100644 (file)
--- a/CRM/Queue/Queue/SqlTrait.php
+++ b/CRM/Queue/Queue/SqlTrait.php
@@ -56,11 +56,11 @@ trait CRM_Queue_Queue_SqlTrait {
    * @return int
    */
   public function numberOfItems() {
-    return CRM_Core_DAO::singleValueQuery("
+    return (int) CRM_Core_DAO::singleValueQuery('
       SELECT count(*)
       FROM civicrm_queue_item
       WHERE queue_name = %1
-    ", [
+    ', [
       1 => [$this->getName(), 'String'],
     ]);
   }

diff --git a/templates/CRM/Queue/Page/Runner.tpl b/templates/CRM/Queue/Page/Runner.tpl
index e7ade413415e3632a1e6bc8ae3768fa277d4a279..620b834c0e47b9ee946d141af1b987b3e63c503f 100644 (file)
--- a/templates/CRM/Queue/Page/Runner.tpl
+++ b/templates/CRM/Queue/Page/Runner.tpl
@@ -63,7 +63,7 @@ CRM.$(function($) {
     if (!data.is_error) {
       queueRunnerData.completed++;
     }
-    if (data.numberOfItems) {
+    if ('numberOfItems' in data && data.numberOfItems !== null) {
       queueRunnerData.numberOfItems = parseInt(data.numberOfItems);
     }