Index: domain_conf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v
retrieving revision 1.46
diff -u -F^f -r1.46 domain_conf.module
--- domain_conf.module	14 Jun 2009 19:29:49 -0000	1.46
+++ domain_conf.module	18 Aug 2009 22:31:30 -0000
@@ -605,20 +605,33 @@ function _domain_conf_load_primary($unse
 
   if (empty($settings)) {
     $cache = 'cache';
+    $variable = 'variable';
     // Account for table prefixing.
     if (empty($db_prefix)) {
       $cache_table = $cache;
+      $variable_table = $variable;
     }
     else if (is_string($db_prefix)) {
       $cache_table = $db_prefix . $cache;
+      $variable_table = $db_prefix . $variable;
     }
     else {
       $cache_table = $db_prefix['default'] . $cache;
+      $variable_table = $db_prefix['default'] . $variable;
     }
     $cache_table = db_escape_table($cache_table);
+    $variable_table = db_escape_table($variable_table);
     // Load the query.
     $data = db_result(db_query("SELECT data FROM $cache_table WHERE cid = 'variables'"));
     $settings = unserialize($data);
+    
+    if (empty($settings)) {
+      $settings = array();
+      $result = db_query("SELECT * FROM $variable_table");
+      while ($row = db_fetch_object($result)) {
+        $settings[$row->name] = unserialize($row->value);
+      }
+    }
   }
   // Do we reset the global or just return data?
   if ($unset) {