From 7f33f79824d08e3cfdc96495667827fa5db1ee73 Mon Sep 17 00:00:00 2001
From: Noah Miller <nm@lemnisc.us>
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 f515564998a6..ef6d06646deb 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -4222,6 +4222,10 @@ public function relationship(&$values) {
   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');