diff --git a/includes/database.inc b/includes/database.inc index 7fca7a2b5867c457a2b28ca498ac01d6f15a47e6..e9c67113809d3d8dfb463b7f10fdee7ac3b07e5c 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -280,7 +280,7 @@ function db_rewrite_sql($query, $primary_table = 'n', $primary_field = 'nid', $ if ($distinct) { $field_to_select = 'DISTINCT('. $primary_table .'.'. $primary_field .')'; // (?<!text) is a negative look-behind (no need to rewrite queries that already use DISTINCT). - $query = preg_replace('/(SELECT.*)('. $primary_table .'\.)?(?<!DISTINCT\()(?<!DISTINCT\('. $primary_table .'\.)'. $primary_field .'(.*FROM)/AUsi', '\1'. $field_to_select .'\3', $query); + $query = preg_replace('/(SELECT.*)('. $primary_table .'\.)?(?<!DISTINCT\()(?<!DISTINCT\('. $primary_table .'\.)'. $primary_field .'(.*FROM )/AUsi', '\1'. $field_to_select .'\3', $query); } if (!empty($where) || !empty($join)) {