Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1591726 by sun, tim.plunkett: Fixed Missing form_id, form_build_id, and form_token when using custom #parents and #tree = TRUE on $form itself.

merge-requests/26/head
David Rothstein 2012-06-12 10:32:30 -04:00
parent d072581b89
commit 121b348394
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/form.inc
View File

@ -977,6 +977,10 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
'#value' => $form['#build_id'], '#value' => $form['#build_id'],
'#id' => $form['#build_id'], '#id' => $form['#build_id'],
'#name' => 'form_build_id', '#name' => 'form_build_id',
// Form processing and validation requires this value, so ensure the
// submitted form value appears literally, regardless of custom #tree
// and #parents being set elsewhere.
'#parents' => array('form_build_id'),
); );
// Add a token, based on either #token or form_id, to any form displayed to // Add a token, based on either #token or form_id, to any form displayed to
@ -1000,6 +1004,10 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
'#id' => drupal_html_id('edit-' . $form_id . '-form-token'), '#id' => drupal_html_id('edit-' . $form_id . '-form-token'),
'#type' => 'token', '#type' => 'token',
'#default_value' => drupal_get_token($form['#token']), '#default_value' => drupal_get_token($form['#token']),
// Form processing and validation requires this value, so ensure the
// submitted form value appears literally, regardless of custom #tree
// and #parents being set elsewhere.
'#parents' => array('form_token'),
); );
} }
} }
@ -1009,6 +1017,10 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
'#type' => 'hidden', '#type' => 'hidden',
'#value' => $form_id, '#value' => $form_id,
'#id' => drupal_html_id("edit-$form_id"), '#id' => drupal_html_id("edit-$form_id"),
// Form processing and validation requires this value, so ensure the
// submitted form value appears literally, regardless of custom #tree
// and #parents being set elsewhere.
'#parents' => array('form_id'),
); );
} }
if (!isset($form['#id'])) { if (!isset($form['#id'])) {