Commit 7a8773ef authored by Gábor Hojtsy's avatar Gábor Hojtsy

#176141 by yched and myself: only print install page layout, if there is some...

#176141 by yched and myself: only print install page layout, if there is some output to send to the user. If JSON output is generated, it is already printed and should not be themed with HTML.
parent 881ab03b
......@@ -616,7 +616,6 @@ function install_missing_modules_error($profile) {
*/
function install_tasks($profile, $task) {
global $base_url, $install_locale;
$output = '';
// Bootstrap newly installed Drupal, while preserving existing messages.
$messages = isset($_SESSION['messages']) ? $_SESSION['messages'] : '';
......@@ -716,7 +715,7 @@ function install_tasks($profile, $task) {
if ($task == 'locale-batch') {
include_once 'includes/batch.inc';
include_once 'includes/locale.inc';
$output .= _batch_page();
$output = _batch_page();
}
// Display a 'finished' page to user.
......@@ -744,8 +743,11 @@ function install_tasks($profile, $task) {
install_task_list($task);
variable_set('install_task', $task);
// Output page.
print theme('maintenance_page', $output);
// Output page, if some output was required. Otherwise it is possible
// that we are printing a JSON page and theme output should not be there.
if (isset($output)) {
print theme('maintenance_page', $output);
}
}
/**
......
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