Index: dbtng.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dbtng/dbtng.module,v
retrieving revision 1.1.2.11
diff -u -p -r1.1.2.11 dbtng.module
--- dbtng.module	5 Oct 2010 00:49:56 -0000	1.1.2.11
+++ dbtng.module	29 Dec 2010 15:07:09 -0000
@@ -12,7 +12,7 @@
  * Implementation of hook_init().
  */
 function dbtng_init() {
-  global $db_url, $databases;
+  global $db_url, $databases, $db_prefix;
 
   if (empty($db_url)) {
     // @TODO: Add some error logging here?
@@ -23,13 +23,16 @@ function dbtng_init() {
   // $databases which will be automatically parsed by DBTNG in
   // Databse::ParseConnectionInfo.
   $databases = array();
+  $prefixes = is_array($db_prefix) ? $db_prefix : array('default' => $db_prefix);
   if (is_array($db_url)) {
     foreach ($db_url as $key => $connect_url) {
       $databases[$key]['default'] = dbtng_get_db_settings($connect_url);
+      $databases[$key]['default']['prefix'] = isset($prefixes[$key]) ? $prefixes[$key] : $prefixes['default'];      
     }
   }
   else {
     $databases['default']['default'] = dbtng_get_db_settings($db_url);
+    $databases['default']['default']['prefix'] = $prefixes['default'];    
   }
 }
 
