Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 block.admin.inc
--- modules/block/block.admin.inc	22 Dec 2007 23:24:24 -0000	1.14
+++ modules/block/block.admin.inc	11 Feb 2008 18:59:54 -0000
@@ -19,22 +19,18 @@ function block_admin_display($theme = NU
   $blocks = _block_rehash();
   usort($blocks, '_block_compare');
 
-  return drupal_get_form('block_admin_display_form', $blocks, $theme);
+  return drupal_get_form('block_admin_display_form', $blocks);
 }
 
 /**
  * Generate main blocks administration form.
  */
-function block_admin_display_form(&$form_state, $blocks, $theme = NULL) {
-  global $theme_key, $custom_theme;
+function block_admin_display_form(&$form_state, $blocks) {
+  global $theme_key;
 
   // Add CSS
   drupal_add_css(drupal_get_path('module', 'block') .'/block.css', 'module', 'all', FALSE);
 
-  // If non-default theme configuration has been selected, set the custom theme.
-  $custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland');
-  init_theme();
-
   $throttle = module_exists('throttle');
   $block_regions = system_region_list($theme_key) + array(BLOCK_REGION_NONE => '<'. t('none') .'>');