? 6-validate.patch
? 6-x-conf-ignore.patch
? 652000-settings-b.patch
? 692772-warnings.patch
? domain_content/README-698568.txt.patch
Index: API.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/API.php,v
retrieving revision 1.51
diff -u -p -r1.51 API.php
--- API.php	1 Nov 2009 18:20:19 -0000	1.51
+++ API.php	31 Jan 2010 22:34:04 -0000
@@ -319,18 +319,29 @@ function hook_domainform(&$form) {
  *  may have values that vary on each domain.
  *
  * @return
- *  An array of form_id values representing forms that require warnings.
+ *   An associative array where the keys form_id values representing forms 
+ *   that require warnings. The value should return a link for where the
+ *   form may be set for the current domain. If no link exists, you should
+ *   pass NULL as the value.
+ *
+ *   These values are subject to token replacement, using the syntax
+ *   %value, where %NAME may be any element of the $_domain array.
  *
  * @ingroup domain_hooks
  */
 function hook_domainwarnings() {
   // These are the forms for variables set by Domain Conf.
-  return array(
+  $forms = array(
     'system_admin_theme_settings',
     'system_date_time_settings',
     'system_site_information_settings',
     'system_site_maintenance_settings'
   );
+  $return = array();
+  foreach ($forms as $key) {
+    $return[$key] = 'admin/build/domain/path/%domain_id';
+  }
+  return $return;
 }
 
 /**
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.134.2.3
diff -u -p -r1.134.2.3 domain.module
--- domain.module	8 Dec 2009 16:57:18 -0000	1.134.2.3
+++ domain.module	31 Jan 2010 22:34:08 -0000
@@ -2139,11 +2139,19 @@ function domain_warning_check($form_id) 
     // Add the list of forms
     $forms = array();
     $forms = module_invoke_all('domainwarnings');
-    if ($form_id == 'domain_batch_form' || (arg(2) != 'domain' && in_array($form_id, $forms))) {
+    if ($form_id == 'domain_batch_form' || (arg(2) != 'domain' && in_array($form_id, array_keys($forms)))) {
       $default = domain_default();
+      $link_text = '';
+      $link = $forms[$form_id];
+      if (!empty($link)) {
+        $replace = explode('|', '%'. implode('|%', array_keys($_domain)));
+        $values = explode('|', implode('|', $_domain));
+        $link = str_replace($replace, $values, $link);
+        $link_text =  '<br />'. t('Edit settings for the current domain at <a href="!url">%link</a>.', array('!url' => url($link), '%link' => $link));
+      }
       if ($_domain['domain_id'] != $default['domain_id']) {
         $_path = domain_get_uri($default);
-        drupal_set_message(t('You are viewing #this. This form may need to be entered from <a href="!url">!domain</a>', array('#this' => $_domain['subdomain'], '!url' => $_path, '!domain' => $default['subdomain'])));
+        drupal_set_message(t('This form controls the settings for your primary domain and <a href="!url">may need to be entered from !domain</a>. !link', array('#this' => $_domain['subdomain'], '!url' => $_path, '!domain' => $default['subdomain'], '!link' => $link_text)), 'warning', FALSE);
       }
     }
     $_warning = TRUE;
Index: domain_conf/domain_conf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_conf/domain_conf.module,v
retrieving revision 1.53
diff -u -p -r1.53 domain_conf.module
--- domain_conf/domain_conf.module	1 Nov 2009 18:20:19 -0000	1.53
+++ domain_conf/domain_conf.module	31 Jan 2010 22:34:10 -0000
@@ -147,14 +147,20 @@ function domain_conf_domainlinks($domain
  */
 function domain_conf_domainwarnings() {
   // These are the forms for variables set by Domain Conf.
-  return array(
+  $forms = array(
     'system_admin_theme_settings',
     'system_date_time_settings',
+    'system_performance_settings',
     'system_site_information_settings',
     'system_site_maintenance_settings',
     'locale_languages_overview_form',
     'menu_configure',
   );
+  $return = array();
+  foreach ($forms as $form) {
+    $return[$form] = 'admin/build/domain/conf/%domain_id';
+  }
+  return $return;
 }
 
 /**
Index: domain_theme/domain_theme.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_theme/Attic/domain_theme.module,v
retrieving revision 1.19
diff -u -p -r1.19 domain_theme.module
--- domain_theme/domain_theme.module	1 Nov 2009 18:20:19 -0000	1.19
+++ domain_theme/domain_theme.module	31 Jan 2010 22:34:10 -0000
@@ -259,10 +259,15 @@ function domain_theme_batch($values) {
  * Implement hook_domainwarnings()
  */
 function domain_theme_domainwarnings() {
-  return array(
+  $forms =  array(
     'system_themes_form',
     'system_theme_settings',
   );
+  $return = array();
+  foreach ($forms as $form) {
+    $return[$form] =  'admin/build/domain/theme/%domain_id';
+  }
+  return $return;
 }
 
 /**