Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.88
diff -u -p -r1.88 domain.module
--- domain.module	4 Jan 2009 16:41:23 -0000	1.88
+++ domain.module	16 Feb 2009 01:20:03 -0000
@@ -64,6 +64,7 @@ function domain_init() {
   }
   // End of the error handling routine.
 
+  $www_replaced = FALSE;
   // Strip the www. off the domain, if required by the module settings.
   if (variable_get('domain_www', 0) && strpos($_domain['subdomain'], 'www.') !== FALSE) {
     $_domain['subdomain'] = str_replace('www.', '', $_domain['subdomain']);
@@ -614,6 +615,10 @@ function _domain_rurl_sort($a, $b) {
  */
 function domain_get_user_domains($account, $add_roles = TRUE, $reset = FALSE) {
   static $domains = array();
+  if (!$account) {
+    // This may happen when creating a new user.
+    return array();
+  }
   $uid = (int) $account->uid;
   if (!isset($domains[$uid]) || $reset) {
     $domains[$uid] = array();
@@ -927,7 +932,7 @@ function domain_node_access_records($nod
 
   // If set, grant access to the core site, otherwise
   // The grant must be explicitly given to a domain.
-  if ($node->domain_site) {
+  if (isset($node->domain_site)) {
     $grants[] = array(
       'realm' => 'domain_site',
       'gid' => 0,
Index: domain_content/domain_content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/domain_content.module,v
retrieving revision 1.25
diff -u -p -r1.25 domain_content.module
--- domain_content/domain_content.module	5 Jan 2009 15:44:15 -0000	1.25
+++ domain_content/domain_content.module	15 Feb 2009 13:32:59 -0000
@@ -35,7 +35,7 @@ function domain_content_menu() {
     'page arguments' => array(NULL, TRUE),
     'access callback' => 'domain_content_menu_check',
     'file' => 'domain_content.admin.inc',
-    'description' => 'View content assigned to all affiliate sites.'. $extra,
+    'description' => 'View content assigned to all affiliate sites.',
     'weight' => -10
   );
   // Generate the list of active domains as menu items