From 9a70b28ef8e19714294edd363095f35405c64a34 Mon Sep 17 00:00:00 2001
From: Pengyi Zhang <pengyi@agileware.com.au>
Date: Mon, 22 Jul 2019 09:35:33 +1000
Subject: [PATCH] CIVICRM-1223 Handle error when generate recursion

---
 CRM/Core/BAO/RecurringEntity.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index 067434f01a41..0639f3275bc0 100644
--- a/CRM/Core/BAO/RecurringEntity.php
+++ b/CRM/Core/BAO/RecurringEntity.php
@@ -346,7 +346,12 @@ public function generateRecursiveDates() {
       }
 
       $count = 1;
-      $this->recursion->generateOccurrences();
+      try {
+        $this->recursion->generateOccurrences();
+      } catch (Exception $e) {
+        CRM_Core_Error::statusBounce($e->getMessage());
+        return $recursionDates;
+      }
       foreach ($this->recursion->occurrences as $result) {
         $skip = FALSE;
         if ($result == $this->recursion_start_date) {