diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-22 08:13:58 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-22 08:13:58 +0000 |
| commit | 1eb122344a6b383741265228cd2a286dc94ee8de (patch) | |
| tree | 4ac87ea108a74281bc169c69f65e64fa43083f0f /includes/database/select.inc | |
| parent | d65e0e385302ade07cd526166be9010a30de062b (diff) | |
| download | brdo-1eb122344a6b383741265228cd2a286dc94ee8de.tar.gz brdo-1eb122344a6b383741265228cd2a286dc94ee8de.tar.bz2 | |
#1003860 by dmitrig01, chx: Fixed Count query fails to remove fields and expressions.
Diffstat (limited to 'includes/database/select.inc')
| -rw-r--r-- | includes/database/select.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/database/select.inc b/includes/database/select.inc index b0d0eb275..16091061b 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -1370,14 +1370,14 @@ class SelectQuery extends Query implements SelectQueryInterface { // the GROUP BY clause need to be present in the query. $fields =& $count->getFields(); foreach (array_keys($fields) as $field) { - if (!empty($group_by[$field])) { + if (empty($group_by[$field])) { unset($fields[$field]); } } $expressions =& $count->getExpressions(); foreach (array_keys($expressions) as $field) { - if (!empty($group_by[$field])) { - unset($fields[$field]); + if (empty($group_by[$field])) { + unset($expressions[$field]); } } |