diff options
Diffstat (limited to 'includes/database.mysqli.inc')
| -rw-r--r-- | includes/database.mysqli.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index 82a2c3a47..06e2bc744 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -416,7 +416,7 @@ function db_table_exists($table) { function db_distinct_field($table, $field, $query) { $field_to_select = 'DISTINCT('. $table .'.'. $field .')'; // (?<!text) is a negative look-behind (no need to rewrite queries that already use DISTINCT). - return preg_replace('/(SELECT.*)('. $table .'\.)?(?<!DISTINCT\()(?<!DISTINCT\('. $table .'\.)'. $field .'(.*FROM )/AUsi', '\1'. $field_to_select .'\3', $query); + return preg_replace('/(SELECT.*)(?:'. $table .'\.|\s)(?<!DISTINCT\()(?<!DISTINCT\('. $table .'\.)'. $field .'(.*FROM )/AUsi', '\1 '. $field_to_select .'\2', $query); } /** |