Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.239
diff -u -r1.239 update.php
--- update.php	8 Dec 2007 14:06:20 -0000	1.239
+++ update.php	15 Dec 2007 02:25:42 -0000
@@ -877,5 +877,7 @@
   $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);
 }
Index: includes/batch.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/batch.inc,v
retrieving revision 1.13
diff -u -r1.13 batch.inc
--- includes/batch.inc	8 Dec 2007 14:06:20 -0000	1.13
+++ includes/batch.inc	15 Dec 2007 02:25:42 -0000
@@ -133,7 +133,7 @@
     // 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