1 files changed, 12 insertions, 1 deletions
diff --git a/includes/database.inc b/includes/database.inc
index dd5d28af9..db6e4e17f 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -4,7 +4,18 @@
 function db_prefix_tables($sql) {
   global $db_prefix;
 
-  return strtr($sql, array("{" => $db_prefix, "}" => ""));
+  if (is_array($db_prefix)) {
+    $prefix = $db_prefix["default"];
+    foreach ($db_prefix as $key => $val) {
+      if ($key !== "default") {
+        $sql = strtr($sql, array("{". $key. "}" => $val. $key));
+      }
+    }
+  }
+  else {
+    $prefix = $db_prefix;
+  }
+  return strtr($sql, array("{" => $prefix, "}" => ""));
 }
 
 $db_type = substr($db_url, 0, strpos($db_url, "://"));