? 6-validate.patch
? 6-x-conf-ignore.patch
? 683400-redirect.patch
? 710712-dc.patch
? 745540-lang.patch
? 755456-settings-backport.patch
? 757746-domain-content.patch
? 758772-sitename.patch
? test.patch
Index: domain_content/README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/README.txt,v
retrieving revision 1.8.2.1
diff -u -p -r1.8.2.1 README.txt
--- domain_content/README.txt	31 Jan 2010 21:47:06 -0000	1.8.2.1
+++ domain_content/README.txt	5 Apr 2010 18:33:42 -0000
@@ -22,6 +22,7 @@ CONTENTS
 4.  Content Editing
 4.1   Affiliates
 4.2   Domain Access Options
+4.3   Form Behavior
 5.  Developer Notes
 
 
@@ -146,10 +147,27 @@ By default, the currently active domain 
 promoting new nodes to all affiliates.
 
 WARNING: It is possible that you may move some nodes to domains other
-than the currently active domain.  If so, some nodes will be reomved from
+than the currently active domain.  If so, some nodes will be removed from
 the form after you submit the update.  This behavior is normal and desired.
 
 ----
+4.3 Form Behavior
+
+In 6.x.2.5 and higher, you may select one of two options when updating domains.
+
+Under the 'Update behavior' form element, you may choose:
+
+  [] Replace old values with new settings
+  [] Append new settings to existing values 
+
+Choosing the former will erase any current domain affiliation for the selected nodes
+and replace them with those entered into the form. Choosing the latter option will
+merge the new values with the existing values.
+
+This new feature is helpful when you want to add multiple domains to an additional
+domain, but do not want all nodes to be assigned to the same affiliates.
+
+----
 5.  Developer Notes
 
 A companion module that handles this function for Comments is also needed.
Index: domain_content/domain_content.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/domain_content.admin.inc,v
retrieving revision 1.15.2.4
diff -u -p -r1.15.2.4 domain_content.admin.inc
--- domain_content/domain_content.admin.inc	5 Apr 2010 18:13:45 -0000	1.15.2.4
+++ domain_content/domain_content.admin.inc	5 Apr 2010 18:33:43 -0000
@@ -255,6 +255,13 @@ function domain_content_form($form_state
       '#collapsed' => TRUE,
       '#prefix' => '<div class="description">'. t('If you select <em>Change affiliate publishing options</em> above, you should confirm the <em>Affiliate publishing options</em> settings below.') .'</div>'
     );
+    $form['domain']['behavior'] = array(
+      '#type' => 'radios',
+      '#title' => t('Update behavior'),
+      '#options' => array(0 => t('Replace old values with new settings'), 1 => t('Add new settings to existing values')),
+      '#description' => t('Defines how new grants will be applied to the updated nodes.'),
+      '#default_value' => 0,
+    );
     $form['domain']['domain_site'] = array(
       '#type' => 'checkbox',
       '#prefix' => t('<p><b>Publishing options:</b>'),
@@ -371,6 +378,14 @@ function domain_content_update_nodes($fo
     }
     // Make sure the node is valid.
     if ($node->nid > 0) {
+      // If appending values, do so here.
+      if (!empty($form_state['values']['behavior'])) {
+        $current = domain_get_node_domains($node->nid);
+        if (!empty($current['domain_site'])) {
+          $domain_site = TRUE;
+        }
+        $domains += $current['domain_id'];
+      }
       // Use our new options, as set above.
       $node->domain_site = $domain_site;
       $node->domains = $domains;