From c352fb6d3d25290aa9ec67a52cdf63c2d035e5aa Mon Sep 17 00:00:00 2001
From: Djungle Labs <djungle@59123.no-reply.drupal.org>
Date: Mon, 5 Oct 2015 09:30:42 -0400
Subject: [PATCH] salbertz patch #28

---
 plugins/views_plugin_query_default.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/views_plugin_query_default.inc b/plugins/views_plugin_query_default.inc
index 0ec501a..06c6107 100644
--- a/plugins/views_plugin_query_default.inc
+++ b/plugins/views_plugin_query_default.inc
@@ -1205,7 +1205,10 @@ class views_plugin_query_default extends views_plugin_query {
       }
       // This is a formula, using no tables.
       elseif (empty($field['table'])) {
-        $non_aggregates[] = $fieldname;
+        // don't add fields with aggregate functions to non aggregates
+        if (empty($field['aggregate']) || $field['aggregate'] != true) {
+          $non_aggregates[] = $fieldname;
+        }
         $placeholders = !empty($field['placeholders']) ? $field['placeholders'] : array();
         $query->addExpression($string, $fieldname, $placeholders);
       }
-- 
1.9.5.msysgit.0