From: atif-shaikh <shaikh388@gmail.com>
Date: Thu, 11 Sep 2014 06:34:25 +0000 (+0530)
Subject: CRM-15231 Regression Fix for Api Break
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ac4985d5c8922ef21dd4277413304e8c679d1b8c;p=civicrm-core.git

CRM-15231 Regression Fix for Api Break

----------------------------------------
* CRM-15231: Fatal error on search when ACLs are enabled
  https://issues.civicrm.org/jira/browse/CRM-15231
---

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index ea30128358..f7391601a2 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -84,6 +84,7 @@ class CRM_Contact_BAO_Query {
 
   public $_paramLookup;
 
+  public $_sort;
   /**
    * the set of output params
    *
@@ -4698,9 +4699,7 @@ civicrm_relationship.is_permission_a_b = 0
         $this->_fromClause = self::fromClause($this->_tables, NULL, NULL, $this->_primaryLocation, $this->_mode);
         $this->_simpleFromClause = self::fromClause($this->_whereTables, NULL, NULL, $this->_primaryLocation, $this->_mode);
         // note : this modifies _fromClause and _simpleFromClause
-        if (!empty($this->_sort)) {
-          $this->includePseudoFieldsJoin($this->_sort);
-        }
+        $this->includePseudoFieldsJoin($this->_sort);
       }
     }
     else {