summaryrefslogtreecommitdiff
path: root/update.php
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-12-20 11:57:20 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-12-20 11:57:20 +0000
commitfc8b22c615c119402e49d8f41cec20ea9809a0c1 (patch)
tree659d344ea5d78994396b4432b792d1c5755aad65 /update.php
parentfdce0564d6052869068574fac768b1aa23055e12 (diff)
downloadbrdo-fc8b22c615c119402e49d8f41cec20ea9809a0c1.tar.gz
brdo-fc8b22c615c119402e49d8f41cec20ea9809a0c1.tar.bz2
#196630 by yched: postpone warning message display until batch finished, so messages are not forgotten on non-JS batches
Diffstat (limited to 'update.php')
-rw-r--r--update.php4
1 files changed, 3 insertions, 1 deletions
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);
}