diff options
Diffstat (limited to 'includes/form.inc')
| -rw-r--r-- | includes/form.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/includes/form.inc b/includes/form.inc index 0a30e0733..0d08dd230 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -608,7 +608,7 @@ function form_execute_handlers($type, &$form, &$form_state) { // Some previous _submit handler has set a batch. We store the call // in a special 'control' batch set, for execution at the correct // time during the batch processing workflow. - $batch['sets'][] = array('form_submit' => array($function)); + $batch['sets'][] = array('form_submit' => $function); } else { $function($form_state['values'], $form, $form_state); @@ -1903,7 +1903,6 @@ function batch_set($batch_definition) { * URL of the batch processing page. */ function batch_process($redirect = NULL, $url = NULL) { - global $user; $batch =& batch_get(); if (isset($batch)) { @@ -1931,8 +1930,7 @@ function batch_process($redirect = NULL, $url = NULL) { $batch['destination'] = $_REQUEST['edit']['destination']; unset($_REQUEST['edit']['destination']); } - - db_query("INSERT INTO {batch} (bid, sid, timestamp, batch) VALUES (%d, %d, %d, '%s')", $batch['id'], $user->sid, time(), serialize($batch)); + db_query("INSERT INTO {batch} (bid, token, timestamp, batch) VALUES (%d, %d, %d, '%s')", $batch['id'], drupal_get_token($batch['id']), time(), serialize($batch)); drupal_goto($batch['url'], 'op=start&id='. $batch['id']); } else { |