Merge pull request #13774 from mattwire/membership_fataltothrow

Fatal error to exception on Membership BAO
civicrm · Mar 8, 2019 · 7aa9abe · 7aa9abe
2 parents 238556e + 3f6cbd3
commit 7aa9abe
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
@@ -1160,10 +1160,8 @@ public static function fixMembershipStatusBeforeRenew(&$currentMembership, $chan
       $currentMembership
     );
 
-    if (empty($status) ||
-      empty($status['id'])
-    ) {
-      CRM_Core_Error::fatal(ts('Oops, it looks like there is no valid membership status corresponding to the membership start and end dates for this membership. Contact the site administrator for assistance.'));
+    if (empty($status) || empty($status['id'])) {
+      throw new CRM_Core_Exception(ts('Oops, it looks like there is no valid membership status corresponding to the membership start and end dates for this membership. Contact the site administrator for assistance.'));
     }
 
     $currentMembership['today_date'] = $today;