From 1291b0bf6e26a2c40989d6bf14fbbc92648f663b Mon Sep 17 00:00:00 2001 From: atif-shaikh Date: Wed, 10 Sep 2014 15:02:14 +0530 Subject: [PATCH] CRM-15231 - Fatal error on search when ACLs are enabled https://issues.civicrm.org/jira/browse/CRM-15231 --- CRM/Contact/BAO/Query.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index c4431c9ec1..716cf0b914 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -4598,7 +4598,6 @@ civicrm_relationship.is_permission_a_b = 0 // note : this modifies _fromClause and _simpleFromClause $this->_sort = $sort; - $this->includePseudoFieldsJoin($sort); list($select, $from, $where, $having) = $this->query($count, $sortByChar, $groupContacts, $onlyDeleted); @@ -4698,9 +4697,7 @@ civicrm_relationship.is_permission_a_b = 0 //CRM-15231 $this->_fromClause = self::fromClause($this->_tables, NULL, NULL, $this->_primaryLocation, $this->_mode); $this->_simpleFromClause = self::fromClause($this->_whereTables, NULL, NULL, $this->_primaryLocation, $this->_mode); - if (!empty($_GET['crmSID'])) { - $this->includePseudoFieldsJoin($this->_sort); - } + $this->includePseudoFieldsJoin($this->_sort); } } else { -- 2.25.1