diff options
Diffstat (limited to 'includes/form.inc')
-rw-r--r-- | includes/form.inc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/includes/form.inc b/includes/form.inc index b2ad0e491..545ad33ef 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -248,7 +248,7 @@ function drupal_process_form($form_id, &$form) { $form_button_counter = array(0, 0); drupal_prepare_form($form_id, $form); - if (($form['#programmed']) || (!empty($_POST) && (($_POST['form_id'] == $form_id) || ($_POST['form_id'] == $form['#base'])))) { + if (($form['#programmed']) || (!empty($_POST) && (($_POST['form_id'] == $form_id)))) { drupal_validate_form($form_id, $form); // IE does not send a button value when there is only one submit button (and no non-submit buttons) // and you submit by pressing enter. @@ -307,11 +307,6 @@ function drupal_prepare_form($form_id, &$form) { ); } - // If $base is set, it is used in place of $form_id when constructing validation, - // submission, and theming functions. Useful for mapping many similar or duplicate - // forms with different $form_ids to the same processing functions. - $base = isset($form['#base']) ? $form['#base'] : ''; - // Add a token, based on either #token or form_id, to any form displayed to // authenticated users. This ensures that any submitted form was actually // requested previously by the user and protects against cross site request @@ -347,9 +342,6 @@ function drupal_prepare_form($form_id, &$form) { if (function_exists($form_id .'_validate')) { $form['#validate'] = array($form_id .'_validate' => array()); } - elseif (function_exists($base .'_validate')) { - $form['#validate'] = array($base .'_validate' => array()); - } } if (!isset($form['#submit'])) { @@ -357,9 +349,6 @@ function drupal_prepare_form($form_id, &$form) { // We set submit here so that it can be altered. $form['#submit'] = array($form_id .'_submit' => array()); } - elseif (function_exists($base .'_submit')) { - $form['#submit'] = array($base .'_submit' => array()); - } } foreach (module_implements('form_alter') as $module) { @@ -469,15 +458,11 @@ function drupal_submit_form($form_id, $form) { */ function drupal_render_form($form_id, &$form) { // Don't override #theme if someone already set it. - $base = isset($form['#base']) ? $form['#base'] : ''; if (!isset($form['#theme'])) { if (theme_get_function($form_id)) { $form['#theme'] = $form_id; } - elseif (theme_get_function($base)) { - $form['#theme'] = $base; - } } if (isset($form['#pre_render'])) { |