diff options
Diffstat (limited to 'modules/block/block.admin.inc')
| -rw-r--r-- | modules/block/block.admin.inc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc index 455b48b38..a1e65457d 100644 --- a/modules/block/block.admin.inc +++ b/modules/block/block.admin.inc @@ -10,11 +10,6 @@ * Menu callback for admin/structure/block. */ function block_admin_display($theme = NULL) { - global $custom_theme; - - // If non-default theme configuration has been selected, set the custom theme. - $custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland'); - // Fetch and sort blocks. $blocks = _block_rehash(); usort($blocks, '_block_compare'); @@ -26,14 +21,10 @@ function block_admin_display($theme = NULL) { * Generate main blocks administration form. */ function block_admin_display_form($form, &$form_state, $blocks, $theme = NULL) { - global $theme_key, $custom_theme; + global $theme_key; drupal_add_css(drupal_get_path('module', 'block') . '/block.css', array('preprocess' => FALSE)); - // If non-default theme configuration has been selected, set the custom theme. - $custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland'); - drupal_theme_initialize(); - $block_regions = system_region_list($theme_key, REGIONS_VISIBLE) + array(BLOCK_REGION_NONE => '<' . t('none') . '>'); // Weights range from -delta to +delta, so delta should be at least half |