Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.426 diff -u -r1.426 form.inc --- includes/form.inc 8 Jan 2010 06:36:34 -0000 1.426 +++ includes/form.inc 8 Jan 2010 10:14:30 -0000 @@ -3375,8 +3375,8 @@ /** * Processes the batch. * - * Unless the batch has been marked with 'progressive' = FALSE, the function - * issues a drupal_goto and thus ends page execution. + * By default, the function issues a drupal_goto and thus ends page execution. + * See the $progressive and $redirect_callback parameters. * * This function is generally not needed in form submit handlers; * Form API takes care of batches that were set during form submission. @@ -3391,8 +3391,10 @@ * processing page. By default drupal_goto() will be used to redirect to a * page which will do the progressive page. Specifying another function will * allow the progressive processing to be processed differently. + * @param $progressive + * (optional) Boolean indicating whether the processing should . Defaults to TRUE. */ -function batch_process($redirect = NULL, $url = 'batch', $redirect_callback = 'drupal_goto') { +function batch_process($redirect = NULL, $url = 'batch', $redirect_callback = 'drupal_goto', $progressive = TRUE) { $batch =& batch_get(); drupal_theme_initialize(); @@ -3401,7 +3403,7 @@ // Add process information $process_info = array( 'current_set' => 0, - 'progressive' => TRUE, + 'progressive' => $progressive, 'url' => $url, 'url_options' => array(), 'source_url' => $_GET['q'], Index: install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.231 diff -u -r1.231 install.php --- install.php 4 Jan 2010 23:08:34 -0000 1.231 +++ install.php 8 Jan 2010 10:11:43 -0000 @@ -436,13 +436,9 @@ if ($install_state['interactive']) { variable_set('install_current_batch', $function); } - else { - $batch =& batch_get(); - $batch['progressive'] = FALSE; - } // Process the batch. For progressive batches, this will redirect. // Otherwise, the batch will complete. - batch_process(install_redirect_url($install_state), install_full_redirect_url($install_state)); + batch_process(install_redirect_url($install_state), install_full_redirect_url($install_state), 'drupal_goto', $install_state['interactive']); } // If we are in the middle of processing this batch, keep sending back // any output from the batch process, until the task is complete.