CRM-15732 : fix looking up deleted 'On behalf' orgs

----------------------------------------
* CRM-15732: Donations with an On Behalf Of an organization profile dedupes with contacts in the trash
  https://issues.civicrm.org/jira/browse/CRM-15732

diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
index 37431862a9aae975da12d2e73a548b0af6a20f9c..27971c62904a26c80fc10f1f3774dfd8ca154805 100644 (file)
--- a/CRM/Contact/BAO/Relationship.php
+++ b/CRM/Contact/BAO/Relationship.php
@@ -1493,7 +1493,8 @@ cr.relationship_type_id IN (%2) AND
 cr.is_permission_a_b    = 1 AND
 IF(cr.end_date IS NULL, 1, (DATEDIFF( CURDATE( ), cr.end_date ) <= 0)) AND
 cr.is_active = 1 AND
-cc.id = cr.contact_id_b";
+cc.id = cr.contact_id_b AND 
+cc.is_deleted = 0";
 
       if (!empty($name)) {
         $name   = CRM_Utils_Type::escape($name, 'String');