? 252877-execute.patch
? 319876-views.patch
? 412156-no-switch.patch
? patch.patch
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.99
diff -u -p -r1.99 domain.module
--- domain.module	24 Mar 2009 20:09:15 -0000	1.99
+++ domain.module	25 Mar 2009 16:22:35 -0000
@@ -690,6 +690,25 @@ function domain_api($domain, $reset = FA
 }
 
 /**
+ * Set the active domain to something other than the HTTP request.
+ *
+ * This function is used in cases where you wish to similuate the loading
+ * of a domain while on another domain.
+ *
+ * @param $domain_id
+ *   The domain id of the domain to load.
+ * @return
+ *   No return value. The global $_domain value is altered, and domain-specific
+ *   data functions are loaded.
+ */
+function domain_set_domain($domain_id) {
+  global $_domain;
+  $_domain = domain_load($domain_id);
+  // Now re-run the bootstrap.
+  _domain_bootstrap_invoke_all('full', $_domain);
+}
+
+/**
  * Implements hook_domainload()
  *
  * Adds the home page 'path' and 'site_grant' boolean.
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.9
diff -u -p -r1.9 domain_content.admin.inc
--- domain_content/domain_content.admin.inc	6 Mar 2009 17:16:13 -0000	1.9
+++ domain_content/domain_content.admin.inc	25 Mar 2009 16:22:35 -0000
@@ -44,10 +44,10 @@ function domain_content_page() {
  */
 function domain_content_view($domain_id = NULL, $all_affiliates = FALSE) {
   global $_domain;
-  // For users with limited privileges, we have to be on the same server
-  // as the content we are looking up.  Will return -1 if it fails.
-  $domain = domain_lookup($domain_id);
-  domain_goto($domain);
+  // Load the active domain, which is not necessarily the current domain.
+  if (!is_null($domain_id) && $domain_id != $_domain['domain_id']) {
+    domain_set_domain($domain_id);
+  }
   $output = '';
   // Override the $_domain global so we can see the appropriate content
   if (!is_null($domain_id)) {