X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FBAO%2FRelationship.php;h=d5f2f123b1a668eb8aa8759a66c892c811304364;hb=df124d3aae6b97e9b08d11740d82f8303040eddd;hp=7c76f0ac6862bdaaf224d3c3fbef80b4e7fb04e1;hpb=6d72812c0b157e49ded21baa2eed68e5127d0da4;p=civicrm-core.git diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 7c76f0ac68..d5f2f123b1 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -1225,8 +1225,10 @@ LEFT JOIN civicrm_country ON (civicrm_address.country_id = civicrm_country.id) while ($relationship->fetch()) { $rid = $relationship->civicrm_relationship_id; $cid = $relationship->civicrm_contact_id; - if (($permissionedContact) && - (!CRM_Contact_BAO_Contact_Permission::relationship($cid, $contactId)) + if (($permissionedContact && + (!CRM_Contact_BAO_Contact_Permission::relationship($cid, $contactId)) + ) || + (!CRM_Contact_BAO_Contact_Permission::allow($cid)) ) { continue; }