From: monishdeb <monish.deb@webaccessglobal.com>
Date: Thu, 25 Jun 2015 20:23:16 +0000 (+0530)
Subject: CRM-16741 fix - Invalid relationship is shown when selecting "relationship type"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=99268e6c2592422d596d8aea99e14d77314432c9;p=civicrm-core.git

CRM-16741 fix - Invalid relationship is shown when selecting "relationship type"

https://issues.civicrm.org/jira/browse/CRM-16741
---

diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
index b3577297b3..f6f5c6bd12 100644
--- a/CRM/Contact/BAO/Relationship.php
+++ b/CRM/Contact/BAO/Relationship.php
@@ -561,7 +561,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship {
           $value['contact_type_b'] == $otherContactType
         ) &&
         (in_array($value['contact_sub_type_a'], $contactSubType) ||
-          in_array($value['contact_sub_type_b'], $contactSubType) ||
           (!$value['contact_sub_type_a'] && !$onlySubTypeRelationTypes)
         )
       ) {
@@ -576,7 +575,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship {
           $value['contact_type_a'] == $otherContactType
         ) &&
         (in_array($value['contact_sub_type_b'], $contactSubType) ||
-          in_array($value['contact_sub_type_a'], $contactSubType) ||
           (!$value['contact_sub_type_b'] && !$onlySubTypeRelationTypes)
         )
       ) {