Merge branch 'hotfix'

NETivism · Nov 7, 2024 · 4f63c00 · 4f63c00
2 parents fdf57b9 + edebf5b
commit 4f63c00
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
@@ -242,7 +242,7 @@ public static function cancelStuckBatch() {
       if ($dao->data) {
         $meta = unserialize($dao->data);
         // after 4 hours without any progress, cancel it
-        if (is_array($meta) && empty($meta['processed'])) {
+        if (is_array($meta) && empty($meta['processed']) && !empty($dao->modified_date)) {
           $lastSuccessTime = strtotime($dao->modified_date);
           if (CRM_REQUEST_TIME - $lastSuccessTime > 3600 * self::EXPIRE_HOUR) {
             CRM_Core_Error::debug_log_message("Canceled running batch id {$dao->id} due to zero progress over ".self::EXPIRE_HOUR." hours.");