Commit 00ae7949 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#172824 by yched: let the batched processes perform drupal_execute() properly

parent 922bf65f
......@@ -315,8 +315,10 @@ function drupal_process_form($form_id, &$form, &$form_state) {
// If batches were set in the submit handlers, we process them now,
// possibly ending execution.
if ($batch =& batch_get()) {
// possibly ending execution. We make sure we do not react to the batch
// that is already being processed (if a batch operation performs a
// drupal_execute).
if ($batch =& batch_get() && !isset($batch['current_set'])) {
// The batch uses its own copies of $form and $form_state for
// late execution of submit handers and post-batch redirection.
$batch['form'] = $form;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment