Index: includes/batch.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/batch.inc,v
retrieving revision 1.36
diff -u -p -r1.36 batch.inc
--- includes/batch.inc	2 Jun 2009 06:58:15 -0000	1.36
+++ includes/batch.inc	26 Aug 2009 13:00:48 -0000
@@ -170,7 +170,7 @@ function _batch_progress_page_nojs() {
     // the error message.
     ob_start();
     $fallback = $current_set['error_message'] . '<br />' . $batch['error_message'];
-    $fallback = theme('maintenance_page', $fallback, FALSE, FALSE);
+    $fallback = theme('maintenance_page', $fallback, 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 below
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.976
diff -u -p -r1.976 common.inc
--- includes/common.inc	26 Aug 2009 10:53:45 -0000	1.976
+++ includes/common.inc	26 Aug 2009 13:00:51 -0000
@@ -912,7 +912,7 @@ function _drupal_log_error($error, $fata
       drupal_set_title(t('Error'));
       // We fallback to a maintenance page at this point, because the page generation
       // itself can generate errors.
-      print theme('maintenance_page', t('The website encountered an unexpected error. Please try again later.'), FALSE);
+      print theme('maintenance_page', t('The website encountered an unexpected error. Please try again later.'));
       exit;
     }
   }