diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-08-26 10:53:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-08-26 10:53:45 +0000 |
| commit | 9d6dcc5682706c3f2d69220243a3c58d20c74200 (patch) | |
| tree | da46f198c4e7e785a28b2e944577d7e28c27f8a4 /includes | |
| parent | 7c36ac0e493601ffa726590961c004d5b72bc2cc (diff) | |
| download | brdo-9d6dcc5682706c3f2d69220243a3c58d20c74200.tar.gz brdo-9d6dcc5682706c3f2d69220243a3c58d20c74200.tar.bz2 | |
- Patch #423992 by JohnAlbin, Davy Van Den Bremt: remove show_blocks page variable.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 6 | ||||
| -rw-r--r-- | includes/theme.inc | 1 | ||||
| -rw-r--r-- | includes/theme.maintenance.inc | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/includes/common.inc b/includes/common.inc index bb4777dcc..25f9fbdad 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -424,9 +424,6 @@ function drupal_not_found() { drupal_set_page_content($return); $page = element_info('page'); - // Optionally omit the blocks to conserve CPU and bandwidth. - $page['#show_blocks'] = variable_get('site_404_blocks', FALSE); - print drupal_render_page($page); } @@ -3893,7 +3890,6 @@ function drupal_set_page_content($content = NULL) { * A string or array representing the content of a page. The array consists of * the following keys: * - #type: Value is always 'page'. This pushes the theming through page.tpl.php (required). - * - #show_blocks: A marker which suppresses sidebar regions if FALSE (optional). * - #show_messages: Suppress drupal_get_message() items. Used by Batch API (optional). * * @see hook_page_alter() @@ -4258,7 +4254,7 @@ function drupal_common_theme() { 'template' => 'page', ), 'maintenance_page' => array( - 'arguments' => array('content' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE), + 'arguments' => array('content' => NULL, 'show_messages' => TRUE), 'template' => 'maintenance-page', 'path' => 'includes', 'file' => 'theme.maintenance.inc', diff --git a/includes/theme.inc b/includes/theme.inc index e3b197697..23c8ab9c0 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -2022,7 +2022,6 @@ function template_process(&$variables, $hook) { */ function template_preprocess_page(&$variables) { // Move some variables to the top level for themer convenience and template cleanliness. - $variables['show_blocks'] = $variables['page']['#show_blocks']; $variables['show_messages'] = $variables['page']['#show_messages']; // Add favicon. diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 69e675e04..3f94aaed8 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -208,7 +208,6 @@ function theme_update_page($content, $show_messages = TRUE) { * * The $variables array contains the following arguments: * - $content - * - $show_blocks * * @see maintenance-page.tpl.php */ |