? domain_blocks
? domain_blocks.zip
? domain_theme.patch
Index: domain_theme/domain_theme.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_theme/domain_theme.module,v
retrieving revision 1.10
diff -u -p -r1.10 domain_theme.module
--- domain_theme/domain_theme.module	6 Jul 2008 21:16:41 -0000	1.10
+++ domain_theme/domain_theme.module	25 Nov 2008 21:50:12 -0000
@@ -22,6 +22,10 @@
 function domain_theme_init() {
   // Assign the theme selected, based on the active domain.
   global $_domain, $custom_theme;
+  // If the theme has already been set (such as an admin theme), ignore.
+  if (!empty($custom_theme)) {
+    return;
+  }
   $default_theme = variable_get('theme_default', 'garland');
   $theme = domain_theme_lookup($_domain['domain_id']);
   // The above returns -1 on failure.