From 3ac0be19f7fe5bda9ad9f9bd4c023f61b818fb3e Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Tue, 4 Apr 2023 17:38:50 -0400 Subject: [PATCH] avoid potentially undefined var --- CRM/Contact/BAO/Relationship.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 022b8accfd..0a3c410817 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -57,10 +57,8 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship implemen } $params = $extendedParams; // Check if this is a "simple" disable relationship. If it is don't check the relationshipType - if (!empty($params['id']) && array_key_exists('is_active', $params) && empty($params['is_active'])) { - $disableRelationship = TRUE; - } - if (empty($disableRelationship) && !CRM_Contact_BAO_Relationship::checkRelationshipType($params['contact_id_a'], $params['contact_id_b'], $params['relationship_type_id'])) { + $disableRelationship = !empty($params['id']) && array_key_exists('is_active', $params) && empty($params['is_active']); + if (!$disableRelationship && !CRM_Contact_BAO_Relationship::checkRelationshipType($params['contact_id_a'], $params['contact_id_b'], $params['relationship_type_id'])) { throw new CRM_Core_Exception('Invalid Relationship'); } $relationship = self::add($params); -- 2.25.1