Commit 62e0ddc7 authored by Dries's avatar Dries

- Patch #545356 by Damien Tournoud: sidebars were broken in install.php,...

- Patch #545356 by Damien Tournoud: sidebars were broken in install.php, update.php, and the expert profile due to a previous patch that made the sidebar regions more semantic for RTL support.
parent d062ec4e
......@@ -3826,7 +3826,7 @@ 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 left/right regions if FALSE (optional).
* - #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()
......@@ -3841,7 +3841,7 @@ function drupal_render_page($page) {
$page = element_info('page');
}
// Modules alter the $page as needed. Blocks are populated into regions like
// 'left', 'footer', etc.
// 'sidebar_first', 'footer', etc.
drupal_alter('page', $page);
return drupal_render($page);
......
......@@ -674,7 +674,7 @@ function install_display_output($output, $install_state) {
// Let the theming function know when every step of the installation has
// been completed.
$active_task = $install_state['installation_finished'] ? NULL : $install_state['active_task'];
drupal_add_region_content('left', theme_task_list(install_tasks_to_display($install_state), $active_task));
drupal_add_region_content('sidebar_first', theme_task_list(install_tasks_to_display($install_state), $active_task));
}
print theme($install_state['database_tables_exist'] ? 'maintenance_page' : 'install_page', $output);
exit;
......
......@@ -57,7 +57,7 @@ function hook_block_list() {
'info' => t('An exciting block provided by Mymodule.'),
'weight' => 0,
'status' => 1,
'region' => 'left',
'region' => 'sidebar_first',
// BLOCK_CACHE_PER_ROLE will be assumed for block 0.
);
......
......@@ -304,9 +304,9 @@ function hook_css_alter(&$css) {
* The $page array contains top level elements for each block region:
* @code
* $page['header']
* $page['left']
* $page['sidebar_first']
* $page['content']
* $page['right']
* $page['sidebar_second']
* $page['footer']
* @endcode
*
......@@ -330,8 +330,8 @@ function hook_css_alter(&$css) {
*
* Blocks may be referenced by their module/delta pair within a region:
* @code
* // The login block in the left sidebar region.
* $page['left']['user-login']['#block'];
* // The login block in the first sidebar region.
* $page['sidebar_first']['user-login']['#block'];
* @endcode
*
* @param $page
......
......@@ -40,7 +40,7 @@ function expert_profile_site_setup(&$install_state) {
'theme' => 'garland',
'status' => 1,
'weight' => 0,
'region' => 'left',
'region' => 'sidebar_first',
'pages' => '',
'cache' => -1,
),
......@@ -50,7 +50,7 @@ function expert_profile_site_setup(&$install_state) {
'theme' => 'garland',
'status' => 1,
'weight' => 0,
'region' => 'left',
'region' => 'sidebar_first',
'pages' => '',
'cache' => -1,
),
......@@ -60,7 +60,7 @@ function expert_profile_site_setup(&$install_state) {
'theme' => 'garland',
'status' => 1,
'weight' => 1,
'region' => 'left',
'region' => 'sidebar_first',
'pages' => '',
'cache' => -1,
),
......
......@@ -240,7 +240,7 @@ function update_task_list($active = NULL) {
'finished' => 'Review log',
);
drupal_add_region_content('left', theme('task_list', $tasks, $active));
drupal_add_region_content('sidebar_first', theme('task_list', $tasks, $active));
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment