Index: drupalvb.inc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.inc.php,v
retrieving revision 1.9.4.12
diff -u -p -r1.9.4.12 drupalvb.inc.php
--- drupalvb.inc.php	1 May 2008 23:24:43 -0000	1.9.4.12
+++ drupalvb.inc.php	5 May 2008 12:32:52 -0000
@@ -31,7 +31,7 @@ function drupalvb_set_login_cookies() {
 
   $cookie_prefix = (isset($vb_config['Misc']['cookieprefix']) ? $vb_config['Misc']['cookieprefix'] : 'bb');
   $cookie_path = $vb_options['cookiepath'];
-  $cookie_domain = $vb_options['cookiedomain'];
+  $cookie_domain = (!empty($vb_options['cookiedomain']) ? $vb_options['cookiedomain'] : $GLOBALS['cookiedomain']);
   $now = time();
   $expire = $now + (@ini_get('session.cookie_lifetime') ? @ini_get('session.cookie_lifetime') : 60 * 60 * 24 * 365);
 
@@ -242,9 +242,9 @@ function drupalvb_get_options() {
   static $options = array();
 
   if (empty($options)) {
-    $result = db_query("SELECT data FROM {datastore} WHERE title = 'options'");
-    if ($data = db_fetch_array($result)) {
-      $options = unserialize($data['data']);
+    $result = db_query("SELECT varname, value FROM {setting}");
+    while ($var = db_fetch_array($result)) {
+      $options[$var['varname']] = $var['value'];
     }
   }
   return $options;