diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-01-08 12:51:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-01-08 12:51:37 +0000 |
| commit | 4ec8c0428e5539f2690d152ac1cde63ea22a6df9 (patch) | |
| tree | dde8fa1d315946980ab364c786b51c8b08e8ddc6 /includes | |
| parent | 7f87b19eeb3af1d6afb4dbca771e261cc49b8caa (diff) | |
| download | brdo-4ec8c0428e5539f2690d152ac1cde63ea22a6df9.tar.gz brdo-4ec8c0428e5539f2690d152ac1cde63ea22a6df9.tar.bz2 | |
- Patch #41644 by chx: critical bug: db_rewrite_sql had a bad regex.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/database.inc b/includes/database.inc index 2c3fe975b..507a37774 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -255,7 +255,7 @@ function _db_rewrite_sql($query = '', $primary_table = 'n', $primary_field = 'ni } /** - * Rewrites node queries. + * Rewrites node, taxonomy and comment queries. Use it for listing queries. * * @param $query * Query to be rewritten. @@ -278,7 +278,7 @@ function db_rewrite_sql($query, $primary_table = 'n', $primary_field = 'nid', $ } if (!empty($join)) { - $query = preg_replace('|FROM[^[:upper:]/,_]+|','\0 '. $join .' ', $query); + $query = preg_replace('/LEFT |RIGHT |INNER |WHERE|GROUP|ORDER|$/', $join .' \0', $query, 1); } if (!empty($where)) { |