4 files changed, 8 insertions, 8 deletions
diff --git a/modules/filter.module b/modules/filter.module
index 1380cfdb4..41e6ad399 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -770,7 +770,7 @@ function filter_form($value = FILTER_FORMAT_DEFAULT) {
     $form['format'] = array('#type' => 'fieldset', '#title' => t('Input format'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -16);
     // Multiple formats available: display radio buttons with tips.
     foreach ($formats as $format) {
-      $form['format'][$format->format] = array('#type' => 'filter_format', '#title' => $format->name, '#default_value' => $value, '#return_value' => $format->format, '#parents' => array('format'), '#description' => theme('filter_tips', _filter_tips($format->format, false)), '#valid' => 'filter_form');
+      $form['format'][$format->format] = array('#type' => 'filter_format', '#title' => $format->name, '#default_value' => $value, '#return_value' => $format->format, '#parents' => array('format'), '#description' => theme('filter_tips', _filter_tips($format->format, false)), '#validate' => 'filter_form_validate');
     }
     return $form;
   }
@@ -797,7 +797,7 @@ function theme_filter_format($element) {
   return $output;
 }
 
-function filter_form_valid($element) {
+function filter_form_validate($element) {
   static $validated;
   if ($validated) {
     return;
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 1380cfdb4..41e6ad399 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -770,7 +770,7 @@ function filter_form($value = FILTER_FORMAT_DEFAULT) {
     $form['format'] = array('#type' => 'fieldset', '#title' => t('Input format'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -16);
     // Multiple formats available: display radio buttons with tips.
     foreach ($formats as $format) {
-      $form['format'][$format->format] = array('#type' => 'filter_format', '#title' => $format->name, '#default_value' => $value, '#return_value' => $format->format, '#parents' => array('format'), '#description' => theme('filter_tips', _filter_tips($format->format, false)), '#valid' => 'filter_form');
+      $form['format'][$format->format] = array('#type' => 'filter_format', '#title' => $format->name, '#default_value' => $value, '#return_value' => $format->format, '#parents' => array('format'), '#description' => theme('filter_tips', _filter_tips($format->format, false)), '#validate' => 'filter_form_validate');
     }
     return $form;
   }
@@ -797,7 +797,7 @@ function theme_filter_format($element) {
   return $output;
 }
 
-function filter_form_valid($element) {
+function filter_form_validate($element) {
   static $validated;
   if ($validated) {
     return;
diff --git a/modules/system.module b/modules/system.module
index a2c6e5a11..6c37fd071 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -59,8 +59,8 @@ function system_elements() {
 
   // Inputs
   $type['checkbox'] = array('#input' => TRUE, '#return_value' => 1);
-  $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#execute' => TRUE);
-  $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#execute' => FALSE);
+  $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['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
   $type['password'] = array('#input' => TRUE, '#size' => 30, '#maxlength' => 64);
   $type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);
diff --git a/modules/system/system.module b/modules/system/system.module
index a2c6e5a11..6c37fd071 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -59,8 +59,8 @@ function system_elements() {
 
   // Inputs
   $type['checkbox'] = array('#input' => TRUE, '#return_value' => 1);
-  $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#execute' => TRUE);
-  $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#execute' => FALSE);
+  $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['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
   $type['password'] = array('#input' => TRUE, '#size' => 30, '#maxlength' => 64);
   $type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);