? 300454-domain-url.patch
? 336221-domain-content.patch
? 336221-domain_content_url_encoding.patch
? domain_prefix/domain_prefix.path.inc
Index: domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain.module,v
retrieving revision 1.40.2.29
diff -u -p -r1.40.2.29 domain.module
--- domain.module	13 Jun 2009 18:21:12 -0000	1.40.2.29
+++ domain.module	13 Jun 2009 20:22:01 -0000
@@ -1281,10 +1281,11 @@ function domain_domainupdate($op, $domai
         db_query("DELETE FROM {node_access} WHERE realm = 'domain_editor' AND gid = %d", $domain['domain_id']);
         db_query("DELETE FROM {domain_access} WHERE realm = 'domain_id' AND gid = %d", $domain['domain_id']);
         db_query("DELETE FROM {domain_access} WHERE realm = 'domain_editor' AND gid = %d", $domain['domain_id']);
-        cache_clear_all();
       }
       break;
   }
+  // In all cases, we need to force a menu rebuild, which also clears the cache.
+  menu_rebuild();
 }
 
 /**
Index: domain_content/domain_content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/domain_content.module,v
retrieving revision 1.15.2.5
diff -u -p -r1.15.2.5 domain_content.module
--- domain_content/domain_content.module	31 May 2009 18:26:44 -0000	1.15.2.5
+++ domain_content/domain_content.module	13 Jun 2009 20:22:01 -0000
@@ -57,7 +57,7 @@ function domain_content_menu($may_cache)
     foreach ($domains as $domain) {
       $check = domain_content_check($domain, $all);
       $items[] = array(
-        'path' => 'admin/domain/content/'. filter_xss_admin($domain['subdomain']),
+        'path' => 'admin/domain/content/'. $domain['domain_id'],
         'title' => t('@domain content', array('@domain' => $domain['sitename'])),
         'description' => t('View content assigned to !domain', array('!domain' => $domain['subdomain'])),
         'callback' => 'domain_content_view',