? 6-validate.patch
? 6-x-conf-ignore.patch
? 721352-isset.patch
? 723262-test.patch
? 723858-scalar.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	24 Feb 2010 17:10:30 -0000
@@ -49,13 +49,13 @@ function domain_bootstrap() {
     // load errors during module enable / disable.
     $error = _domain_bootstrap($phase);
     if ($error === NULL) {
-      $_domain['error'] = -1;
+      (is_array($_domain)) ? $_domain['error'] = -1 : $_domain = array('error' => -1);
       break;
     }
     else if ($error === FALSE) {
       // watchdog() is not available here, and there may be other logging.
       // So we have to write an error message global variable and pick them up in settings,inc.
-      $_domain['error'] = $phase;
+      (is_array($_domain)) ? $_domain['error'] = $phase : $_domain = array('error' => $phase);
       break;
     }
   }