From 0cc9927d88047828b9b2a33267dd8850e120c1d5 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 16 Dec 2015 07:26:19 +0000
Subject: [PATCH] Fix issues found by Dave in testing

---
 CRM/Export/BAO/Export.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 1e8bf40677..ddc0643f07 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -167,10 +167,13 @@ class CRM_Export_BAO_Export {
    *   Query Mode
    * @param array $returnProperties
    *   Return Properties
+   * @param object $query
+   *   CRM_Contact_BAO_Query
+   *
    * @return string $groupBy
    *   Group By Clause
    */
-  public static function getGroupBy($exportMode, $queryMode, $returnProperties) {
+  public static function getGroupBy($exportMode, $queryMode, $returnProperties, $query) {
     if (!empty($returnProperties['tags']) || !empty($returnProperties['groups']) ||
       CRM_Utils_Array::value('notes', $returnProperties) ||
       // CRM-9552
@@ -200,6 +203,9 @@ class CRM_Export_BAO_Export {
     if ($queryMode & CRM_Contact_BAO_Query::MODE_ACTIVITY) {
       $groupBy = " GROUP BY civicrm_activity.id ";
     }
+    
+    $groupBy = !empty($groupBy) ? $groupBy : '';
+    
     return $groupBy;
   }
 
@@ -695,7 +701,7 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
 
     $groupBy = "";
 
-    $groupBy = self::getGroupBy($exportMode, $queryMode, $returnProperties);
+    $groupBy = self::getGroupBy($exportMode, $queryMode, $returnProperties, $query);
 
     $queryString .= $groupBy;
 
-- 
2.25.1