? 6-validate.patch
? 6-x-conf-ignore.patch
? 721148-warnings.patch
Index: API.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/API.php,v
retrieving revision 1.51.2.2
diff -u -p -r1.51.2.2 API.php
--- API.php	28 Feb 2010 23:31:03 -0000	1.51.2.2
+++ API.php	1 Mar 2010 01:52:23 -0000
@@ -741,3 +741,27 @@ function domain_nav_domain_nav_options_a
     }
   }
 }
+
+/**
+ * Allows modules to remove form_ids from the list set
+ * by hook_domainwarnings().
+ *
+ * Required by Domain Settings, whose code is shown below.
+ *
+ * @param &$forms
+ *   An array of form_ids, passed by reference.
+ */
+function hook_domain_warnings_alter(&$forms) {
+  // Forms which Domain Settings handles and are set as warnings.
+  $core_forms = array(
+    'system_admin_theme_settings',
+    'system_site_information_settings',
+    'system_site_maintenance_settings',
+    'menu_configure',
+  );
+  foreach ($core_forms as $form_id) {
+    if (isset($forms[$form_id])) {
+      unset($forms[$form_id]);
+    }
+  }
+}
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.134.2.10
diff -u -p -r1.134.2.10 domain.module
--- domain.module	28 Feb 2010 23:55:29 -0000	1.134.2.10
+++ domain.module	1 Mar 2010 01:52:31 -0000
@@ -2234,6 +2234,7 @@ function domain_warning_check($form_id) 
     // Add the list of forms
     $forms = array();
     $forms = module_invoke_all('domainwarnings');
+    drupal_alter('domain_warnings', $forms);
     // Catch the API change.
     foreach ($forms as $key => $value) {
       if (is_numeric($key)) {
@@ -2247,7 +2248,7 @@ function domain_warning_check($form_id) 
         return;
       }
       $link_text = '';
-      $link = $forms[$form_id];
+      $link = isset($forms[$form_id]) ? $forms[$form_id] : NULL;
       if (!empty($link)) {
         $elements = array();
         foreach ($_domain as $key => $value) {
Index: domain_settings/domain_settings.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_settings/domain_settings.module,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 domain_settings.module
--- domain_settings/domain_settings.module	1 Mar 2010 01:37:32 -0000	1.1.2.5
+++ domain_settings/domain_settings.module	1 Mar 2010 01:52:33 -0000
@@ -174,3 +174,20 @@ function domain_settings_disallow() {
   return $forms;
 }
 
+/**
+ * Implement hook_domain_warnings_alter().
+ */
+function domain_settings_domain_warnings_alter(&$forms) {
+  // Forms which Domain Settings handles and are set as warnings.
+  $core_forms = array(
+    'system_admin_theme_settings',
+    'system_site_information_settings',
+    'system_site_maintenance_settings',
+    'menu_configure',
+  );
+  foreach ($core_forms as $form_id) {
+    if (isset($forms[$form_id])) {
+      unset($forms[$form_id]);
+    }
+  }
+}