CRM-17023, CRM-10687, CRM-12326 query simplification

It seems that the union in the query acheived the same thing as the IF
clause in the revised query.

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index a49bcbad1782051debd80e372faaa65e6cd160d9..84227531dbba434a563bd30476c23ea6fac862c4 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -877,8 +877,7 @@ function civicrm_api3_contact_getquick($params) {
       ";
   }
 
-  $orderByInner = "";
-  $orderByOuter = "ORDER BY exactFirst";
+  $orderByInner = $orderByOuter = "ORDER BY exactFirst";
   if ($config->includeOrderByClause) {
     $orderByInner = "ORDER BY sort_name";
     $orderByOuter .= ", sort_name";
@@ -895,7 +894,8 @@ function civicrm_api3_contact_getquick($params) {
             FROM   civicrm_contact cc {$from}
     {$aclFrom}
     {$additionalFrom} {$includeEmailFrom}
-    {$exactWhereClause}
+    {$whereClause}
+    {$orderByInner}
     LIMIT 0, {$limit} )
     ";
   if ($whereClause != $exactWhereClause) {