Commit fc8b22c6 authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

#196630 by yched: postpone warning message display until batch finished, so...

#196630 by yched: postpone warning message display until batch finished, so messages are not forgotten on non-JS batches
parent fdce0564
......@@ -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
......
......@@ -723,5 +723,7 @@ function update_task_list($active = NULL) {
$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);
}
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