From 47cd307b2c2d8e41ac8dfc3aace5365def400897 Mon Sep 17 00:00:00 2001
From: atif-shaikh <shaikh388@gmail.com>
Date: Wed, 10 Sep 2014 15:29:47 +0530
Subject: [PATCH] CRM-15231 QA Fixes

----------------------------------------
* CRM-15231: Fatal error on search when ACLs are enabled
  https://issues.civicrm.org/jira/browse/CRM-15231
---
 CRM/Contact/BAO/Query.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 716cf0b914..5756247923 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -4596,7 +4596,7 @@ civicrm_relationship.is_permission_a_b = 0
       }
     }
 
-    // note : this modifies _fromClause and _simpleFromClause
+    // CRM-15231
     $this->_sort = $sort;
 
     list($select, $from, $where, $having) = $this->query($count, $sortByChar, $groupContacts, $onlyDeleted);
@@ -4697,6 +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);
+        // note : this modifies _fromClause and _simpleFromClause
         $this->includePseudoFieldsJoin($this->_sort);
       }
     }
-- 
2.25.1