- Committed a slightly modified version of Slavica's table prefix patch.

1 files changed, 6 insertions, 1 deletions

diff --git a/includes/database.pear.inc b/includes/database.pear.inc
index 1b93096b2..ff3b00e4f 100644
--- a/includes/database.pear.inc
+++ b/includes/database.pear.inc
@@ -25,6 +25,7 @@ function db_connect($url) {
 function db_query($query) {
 
   $args = func_get_args();
+  $query = db_prefix_tables($query);
   if (count($args) > 1) {
     $args = array_map("check_query", $args);
     $args[0] = $query;
@@ -38,6 +39,7 @@ function db_query($query) {
 // debug version
 function db_queryd($query) {
   $args = func_get_args();
+  $query = db_prefix_tables($query);
   if (count($args) > 1) {
     $args = array_map("check_query", $args);
     $args[0] = $query;
@@ -147,11 +149,14 @@ function db_query_range($query) {
   $from = array_pop($args);
   if (count(func_get_args()) > 3) {
     $args = array_map("check_query", $args);
+    $query = db_prefix_tables($query);
     $args[0] = $query;
     $result = $db_handle->limitQuery(call_user_func_array("sprintf", $args), $from, $count);
   }
   else {
-    $result = $db_handle->limitQuery(func_get_arg(0), $from, $count);
+    $query = func_get_arg(0);
+    $query = db_prefix_tables($query);
+    $result = $db_handle->limitQuery( $query, $from, $count);
   }
 
   if (variable_get("dev_query", 0)) {