Index: block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.19
diff -u -r1.19 block.admin.inc
--- block.admin.inc	16 Jul 2008 21:59:25 -0000	1.19
+++ block.admin.inc	12 Sep 2008 16:28:09 -0000
@@ -10,10 +10,10 @@
  * Menu callback for admin/build/block.
  */
 function block_admin_display($theme = NULL) {
-  global $custom_theme;
+  global $theme_key;
 
   // If non-default theme configuration has been selected, set the custom theme.
-  $custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland');
+  $theme_key = isset($theme) ? $theme : variable_get('theme_default', 'garland');
 
   // Fetch and sort blocks.
   $blocks = _block_rehash();