? 6-validate.patch
? 6-x-conf-ignore.patch
? 770650-grant.patch
Index: domain.bootstrap.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.bootstrap.inc,v
retrieving revision 1.10.2.4
diff -u -p -r1.10.2.4 domain.bootstrap.inc
--- domain.bootstrap.inc	13 Feb 2010 19:31:04 -0000	1.10.2.4
+++ domain.bootstrap.inc	25 Apr 2010 21:41:30 -0000
@@ -106,6 +106,10 @@ function _domain_bootstrap($phase) {
       if (!domain_settings_setup_ok()) {
         return FALSE;
       }
+
+      // Grant access to all affiliates. See http://drupal.org/node/770650
+      $_domain['site_grant'] = DOMAIN_SITE_GRANT;
+
       _domain_bootstrap_invoke_all('full', $_domain);
       break;
   }
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.134.2.17
diff -u -p -r1.134.2.17 domain.module
--- domain.module	7 Apr 2010 20:16:00 -0000	1.134.2.17
+++ domain.module	25 Apr 2010 21:41:33 -0000
@@ -61,7 +61,7 @@ function domain_init() {
   }
 
   // Error handling in case the module is not installed correctly.
-  if (empty($_domain)) {
+  if (!isset($_domain['domain_id'])) {
     $_domain['error'] = '-1';
   }
   // If $_domain['error'] is present, then set a message and stop.