From 4ec8c0428e5539f2690d152ac1cde63ea22a6df9 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 8 Jan 2006 12:51:37 +0000
Subject: - Patch #41644 by chx: critical bug: db_rewrite_sql had a bad regex.

---
 includes/database.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'includes')

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)) {
-- 
cgit v1.2.3