? 6-x-conf-ignore.patch
? 624626-ignore.patch
? 774692-error.patch
? 775224-settings-conf.patch
? domain_cleanup_0.patch
Index: domain.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.admin.inc,v
retrieving revision 1.41.2.4
diff -u -p -r1.41.2.4 domain.admin.inc
--- domain.admin.inc	25 Apr 2010 21:55:59 -0000	1.41.2.4
+++ domain.admin.inc	29 Apr 2010 20:52:52 -0000
@@ -808,7 +808,9 @@ function domain_batch_form($form_state, 
     '#title' => $batch['#form']['#title'],
     '#description' => $batch['#meta_description']
   );
-
+  if ($batch['#domain_action'] == 'domain_conf' && $batch['#form']['#type'] == 'select') {
+    $batch['#form']['#options'] = array('domain-conf-ignore' => t('Use primary domain settings')) + $batch['#form']['#options'];
+  }
   foreach ($domains as $domain) {
     // Set the current value according to the stored values.
     if (isset($domain[$action])) {
Index: domain_conf/domain_conf.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.admin.inc,v
retrieving revision 1.14.2.2
diff -u -p -r1.14.2.2 domain_conf.admin.inc
--- domain_conf/domain_conf.admin.inc	21 Feb 2010 18:41:40 -0000	1.14.2.2
+++ domain_conf/domain_conf.admin.inc	29 Apr 2010 20:52:56 -0000
@@ -56,7 +56,7 @@ function domain_conf_form($form_state, $
       continue;
     }
     if ($action['#form']['#type'] == 'select') {
-      $action['#form']['#options'] = array(NULL => t('Use primary domain settings')) + $action['#form']['#options'];
+      $action['#form']['#options'] = array('domain-conf-ignore' => t('Use primary domain settings')) + $action['#form']['#options'];
     }
     $group = isset($action['#group']) ? $action['#group'] : $default_group;
     if (!isset($form[$group])) {
Index: domain_conf/domain_conf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v
retrieving revision 1.53.2.6
diff -u -p -r1.53.2.6 domain_conf.module
--- domain_conf/domain_conf.module	17 Mar 2010 18:14:05 -0000	1.53.2.6
+++ domain_conf/domain_conf.module	29 Apr 2010 20:52:57 -0000
@@ -36,6 +36,9 @@ function domain_conf_domain_bootstrap_fu
     $settings = domain_unserialize($data['settings']);
     // Overwrite the $conf variables.
     foreach ($settings as $key => $value) {
+      if ($value == 'domain-conf-ignore') {
+        continue;
+      }
       // Language handling is a special case.
       if ($key == 'language_default') {
         $table = domain_get_primary_table('system');