? 000-entity-load.patch
? 819904-domain0.patch
? test.patch
? domain_alias/domain_alias.domain.inc
? domain_conf/domain_conf.domain.inc
? domain_content/domain_content.domain.inc
? domain_source/domain_source.domain.inc
? domain_theme/domain_theme.domain.inc
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.198
diff -u -p -r1.198 domain.module
--- domain.module	27 Jun 2010 19:38:39 -0000	1.198
+++ domain.module	30 Jun 2010 13:08:57 -0000
@@ -2950,3 +2961,25 @@ function domain_alter_node_query(QueryAl
   }
 }
 
+/**
+ * Implements hook_entity_info_alter()
+ */
+function domain_entity_info_alter(&$entity_info) {
+  // Use our own rewrite handler for the node URL.
+  $entity_info['node']['uri callback'] = 'domain_entity_uri_node';
+}
+
+function domain_entity_uri_node($node) {
+  #dsm($node);
+  # return "node/$node->nid";
+  $source = domain_get_node_match($node->nid);
+  #dsm($source);
+  $options = array();
+  $options['absolute'] = TRUE;
+  // In this case, the $base_url cannot have a trailing slash
+  $options['base_url'] = rtrim($source['path'], '/');
+  return array(
+    'path' => 'node/' . $node->nid,
+    'options' => $options,
+  );
+}
Index: settings_custom_url.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/settings_custom_url.inc,v
retrieving revision 1.31
diff -u -p -r1.31 settings_custom_url.inc
--- settings_custom_url.inc	27 Jun 2010 19:38:39 -0000	1.31
+++ settings_custom_url.inc	30 Jun 2010 13:08:58 -0000
@@ -16,6 +16,7 @@
  * Forces absolute paths for domains when needed.
  */
 function domain_url_outbound_alter(&$path, &$options, $original_path) {
+  return;
   $_domain = domain_get_domain();
 
   // If the domain_id is not set, then the Domain module is not active, and we cannot run this function.