diff options
| -rw-r--r-- | includes/batch.inc | 2 | ||||
| -rw-r--r-- | update.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/batch.inc b/includes/batch.inc index cced0b426..cd2127f0b 100644 --- a/includes/batch.inc +++ b/includes/batch.inc @@ -133,7 +133,7 @@ function _batch_progress_page_nojs() { // followed by the error message. ob_start(); $fallback = $current_set['error_message'] .'<br/>'. $batch['error_message']; - $fallback = theme('maintenance_page', $fallback, FALSE); + $fallback = theme('maintenance_page', $fallback, FALSE, FALSE); // We strip the end of the page using a marker in the template, so any // additional HTML output by PHP shows up inside the page rather than diff --git a/update.php b/update.php index 6ade05465..4c9a18290 100644 --- a/update.php +++ b/update.php @@ -723,5 +723,7 @@ else { $output = update_access_denied_page(); } if (isset($output) && $output) { - print theme('update_page', $output); + // We defer the display of messages until all updates are done. + $progress_page = ($batch = batch_get()) && isset($batch['running']); + print theme('update_page', $output, !$progress_page); } |