? .git
Index: plugins/views_plugin_query_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_query_default.inc,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 views_plugin_query_default.inc
--- plugins/views_plugin_query_default.inc	4 Dec 2009 00:48:32 -0000	1.1.2.13
+++ plugins/views_plugin_query_default.inc	9 Dec 2009 02:49:15 -0000
@@ -66,6 +66,8 @@ class views_plugin_query_default extends
    */
   var $distinct = FALSE;
 
+  var $has_aggregate = FALSE;
+
   /**
    * Constructor; Create the basic query object and fill with default values.
    */
@@ -897,7 +899,6 @@ class views_plugin_query_default extends
 
   function compile_fields($fields_array) {
     $fields = $distinct = array();
-    $has_aggregate = FALSE;
     $non_aggregates = array();
 
     foreach ($fields_array as $field) {
@@ -924,7 +925,7 @@ class views_plugin_query_default extends
           $string = $info[$field['function']]['method']($field['function'], $string);
         }
 
-        $has_aggregate = TRUE;
+        $this->has_aggregate = TRUE;
       }
       elseif ($this->distinct && !in_array($fieldname, $this->groupby)) {
         $string = $GLOBALS['db_type'] == 'pgsql' ? "FIRST($string)" : $string;
@@ -944,7 +945,7 @@ class views_plugin_query_default extends
         $fields[] = $string;
       }
 
-      if ($get_count_optimized) {
+      if (!empty($get_count_optimized)) {
         // We only want the first field in this case.
         break;
       }