diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-08-24 06:36:51 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-08-24 06:36:51 +0000 |
| commit | d7e0b132ee7a4172fa94e85d33d302350eafef26 (patch) | |
| tree | c05bcb67ab38fc685bd39572cd9f85ad27e0c6ec /includes/database.inc | |
| parent | a54ba6b1ed15da720030603e2725a5be875864a7 (diff) | |
| download | brdo-d7e0b132ee7a4172fa94e85d33d302350eafef26.tar.gz brdo-d7e0b132ee7a4172fa94e85d33d302350eafef26.tar.bz2 | |
#79904 by chx. More strict db_rewrite_sql() regexp.
Diffstat (limited to 'includes/database.inc')
| -rw-r--r-- | includes/database.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/database.inc b/includes/database.inc index 7fca7a2b5..e9c671138 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)) { |