? 883180-prefix-bug.patch
Index: domain_prefix.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_prefix/Attic/domain_prefix.module,v
retrieving revision 1.29.2.1
diff -u -p -r1.29.2.1 domain_prefix.module
--- domain_prefix.module	19 Jun 2010 18:57:45 -0000	1.29.2.1
+++ domain_prefix.module	15 Aug 2010 20:13:11 -0000
@@ -27,6 +27,7 @@ define('DOMAIN_PREFIX_UPDATE', 16);
  * Implementats hook_domain_bootstrap_full().
  */
 function domain_prefix_domain_bootstrap_full($domain) {
+  global $db_prefix;
   $tables = array();
   $prefix = 'domain_'. $domain['domain_id'] .'_';
   $result = db_query("SELECT tablename FROM {domain_prefix} WHERE domain_id = %d AND status > %d", $domain['domain_id'], 1);
@@ -34,7 +35,6 @@ function domain_prefix_domain_bootstrap_
     $tables[] = $data['tablename'];
   }
   if (!empty($tables)) {
-    global $db_prefix;
     $new_prefix = array();
     // There might be global prefixing; if so, prepend the global.
     if (is_string($db_prefix)) {
@@ -46,6 +46,9 @@ function domain_prefix_domain_bootstrap_
     }
     $db_prefix = $new_prefix;
   }
+  else {
+    $db_prefix = '';
+  }
   // Check for prefixes of the url_alias table, and if present add hook_domainprefix().
   $count = db_result(db_query("SELECT COUNT(*) FROM {domain_prefix} WHERE status > 1 AND tablename = 'url_alias'"));
   if (!empty($count)) {