Commit 7cd14c71 authored by Dries's avatar Dries

- Patch #760738 by yched: includes full form state in unneeded cases.

parent 636b43e5
......@@ -193,7 +193,7 @@ function drupal_build_form($form_id, &$form_state) {
// Record the filepath of the include file containing the original form,
// so the form builder callbacks can be loaded when the form is being
// rebuilt from cache on a different path (such as 'system/ajax'). See
// form_get_cache().
// form_get_cache().
// $menu_get_item() is not available at installation time.
if (!isset($form_state['build_info']['file']) && !defined('MAINTENANCE_MODE')) {
$item = menu_get_item();
......@@ -655,7 +655,7 @@ function drupal_process_form($form_id, &$form, &$form_state) {
// - The form is multistep.
// In other cases, we only need the information expected by
// drupal_redirect_form().
if ($batch['has_form_submits'] || !empty($form_state['rebuild']) || !empty($form_state['storage'])) {
if ($batch['has_form_submits'] || !empty($form_state['rebuild'])) {
$batch['form_state'] = $form_state;
}
else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment