From 23e36f7bbece019f0df9eae1746a4ab4dfbcfc8a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 14 Mar 2007 19:24:51 +0000
Subject: - Patch #126867 by dmitrig01: fixed caching in presence of database
 prefixes.

---
 includes/database.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/database.inc b/includes/database.inc
index 32cedb2fb..877d950cd 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -191,12 +191,12 @@ define('DB_QUERY_REGEXP', '/(%d|%s|%%|%f|%b)/');
 function db_query($query) {
   $args = func_get_args();
   array_shift($args);
-  $query = db_prefix_tables($query);
   if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
     $args = $args[0];
   }
   _db_query_callback($args, TRUE);
   $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
+  $query = db_prefix_tables($query);
   return _db_query($query);
 }
 
-- 
cgit v1.2.3