From 7fa110b4a24379277202d09abfa0a602eb7e2858 Mon Sep 17 00:00:00 2001 From: deepak-srivastava Date: Wed, 15 Oct 2014 14:25:17 +0100 Subject: [PATCH] take care of empty entity-id or table, in parent methods --- CRM/Core/BAO/RecurringEntity.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php index db0fe1cf51..e244b06bcd 100644 --- a/CRM/Core/BAO/RecurringEntity.php +++ b/CRM/Core/BAO/RecurringEntity.php @@ -354,6 +354,9 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { */ static public function getEntitiesForParent($parentId, $entityTable, $includeParent = TRUE, $mode = 3, $initiatorId = NULL) { $entities = array(); + if (empty($parentId) || empty($entityTable)) { + return $entities; + } if (!$initiatorId) { $initiatorId = $parentId; @@ -435,6 +438,10 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @return int unsigned $parentId Parent ID */ static public function getParentFor($entityId, $entityTable, $includeParent = TRUE) { + if (empty($entityId) || empty($entityTable)) { + return NULL; + } + $query = " SELECT parent_id FROM civicrm_recurring_entity -- 2.25.1