From f85f95bafc406ff5cfe9a4a290e62ab0a0105990 Mon Sep 17 00:00:00 2001 From: Noah Miller Date: Tue, 11 Sep 2018 19:10:42 -0700 Subject: [PATCH] Account for smart groups created in previous versions of Civi which include relation_permission --- CRM/Contact/BAO/Query.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 2b0b209fd2..e5db7e134d 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -4231,6 +4231,10 @@ civicrm_relationship.start_date > {$today} public function addRelationshipPermissionClauses($grouping, &$where) { $relPermission = $this->getWhereValues('relation_permission', $grouping); if ($relPermission) { + if (!is_array($relPermission[2])) { + // this form value was scalar in previous versions of Civi + $relPermission[2] = array($relPermission[2]); + } $where[$grouping][] = "(civicrm_relationship.is_permission_a_b IN (" . implode(",", $relPermission[2]) . "))"; $allRelationshipPermissions = CRM_Contact_BAO_Relationship::buildOptions('is_permission_a_b'); -- 2.25.1