diff options
| -rw-r--r-- | includes/form.inc | 4 | ||||
| -rw-r--r-- | modules/system.module | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/includes/form.inc b/includes/form.inc index a6fd96536..c87c48221 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -375,9 +375,9 @@ function form_builder($form_id, $form) { } } } - if (isset($form['#form_submitted']) && isset($_POST[$form['#name']])) { + if (isset($form['#executes_submit_callback']) && isset($_POST[$form['#name']])) { if ($_POST[$form['#name']] == $form['#value']) { - $form_submitted = $form_submitted || $form['#form_submitted']; + $form_submitted = $form_submitted || $form['#executes_submit_callback']; } } } diff --git a/modules/system.module b/modules/system.module index 7e000f9f0..b675e3ce7 100644 --- a/modules/system.module +++ b/modules/system.module @@ -62,8 +62,8 @@ function system_elements() { // Inputs $type['checkbox'] = array('#input' => TRUE, '#return_value' => 1); - $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => TRUE); - $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => FALSE); + $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => TRUE); + $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => FALSE); $type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE); $type['password'] = array('#input' => TRUE, '#size' => 30); $type['password_confirm'] = array('#input' => TRUE, '#process' => array('expand_password_confirm' => array())); diff --git a/modules/system/system.module b/modules/system/system.module index 7e000f9f0..b675e3ce7 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -62,8 +62,8 @@ function system_elements() { // Inputs $type['checkbox'] = array('#input' => TRUE, '#return_value' => 1); - $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => TRUE); - $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#form_submitted' => FALSE); + $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => TRUE); + $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => FALSE); $type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE); $type['password'] = array('#input' => TRUE, '#size' => 30); $type['password_confirm'] = array('#input' => TRUE, '#process' => array('expand_password_confirm' => array())); |