? 405148-follow.patch
? domain_prefix/445386-sql.patch
Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/README.txt,v
retrieving revision 1.57
diff -u -p -r1.57 README.txt
--- README.txt	31 May 2009 23:19:28 -0000	1.57
+++ README.txt	7 Jun 2009 17:44:00 -0000
@@ -884,6 +884,8 @@ Additional batch actions are made availa
 module.  Other modules may implement hook_domainbatch() to provide
 additional batch actions.
 
+It may be necessary to enter the batch form from the primary domain.
+
 ----
 4.10  Assigning Users to Domains
 
Index: domain.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.admin.inc,v
retrieving revision 1.27
diff -u -p -r1.27 domain.admin.inc
--- domain.admin.inc	31 May 2009 18:16:40 -0000	1.27
+++ domain.admin.inc	7 Jun 2009 17:44:01 -0000
@@ -650,9 +650,6 @@ function domain_batch($action = NULL) {
     return t('There are no domains configured for this site.');
   }
 
-  // This action should be performed from the primary domain.
-  domain_check_primary();
-
   $batch = module_invoke_all('domainbatch');
   // We must have some actions, otherwise, no point.
   if (empty($batch)) {
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.107
diff -u -p -r1.107 domain.module
--- domain.module	31 May 2009 18:16:40 -0000	1.107
+++ domain.module	7 Jun 2009 17:44:03 -0000
@@ -1755,7 +1755,7 @@ function domain_warning_check($form_id) 
     // Add the list of forms
     $forms = array();
     $forms = module_invoke_all('domainwarnings');
-    if (arg(2) != 'domain' && in_array($form_id, $forms)) {
+    if ($form_id = 'domain_batch_form' || (arg(2) != 'domain' && in_array($form_id, $forms))) {
       $default = domain_default();
       if ($_domain['domain_id'] != $default['domain_id']) {
         $_path = domain_get_uri($default);
Index: domain_conf/README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/README.txt,v
retrieving revision 1.18
diff -u -p -r1.18 README.txt
--- domain_conf/README.txt	31 May 2009 18:16:40 -0000	1.18
+++ domain_conf/README.txt	7 Jun 2009 17:44:04 -0000
@@ -125,6 +125,10 @@ All of the current settings are availabl
 You may also choose to remove domain-specific configurations.  This feature
 is useful if you wish to roll back custom changes.
 
+NOTE: If you make batch changes from a domain other than the primary
+domain, the default variable value may be taken from the active domain.
+Be sure to check the values in this form before saving.
+
 ----
 4.  Developer Notes