diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-28 13:06:46 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-28 13:06:46 +0000 |
| commit | 7a8773ef145ea4b912b3a765d627e533c468dd12 (patch) | |
| tree | 0223cee2768275e647560c1fb644a6097fa836b6 /install.php | |
| parent | 881ab03b97f7fdf26288eb3572467545c70eabf5 (diff) | |
| download | brdo-7a8773ef145ea4b912b3a765d627e533c468dd12.tar.gz brdo-7a8773ef145ea4b912b3a765d627e533c468dd12.tar.bz2 | |
#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.
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/install.php b/install.php index 2a254abcc..47661db96 100644 --- a/install.php +++ b/install.php @@ -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); + } } /** |