4 files changed, 24 insertions, 8 deletions
diff --git a/modules/filter.module b/modules/filter.module
index c22eb7bbe..4f793a07d 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -762,7 +762,15 @@ 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' => 'radio', '#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');
+      $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' => array('filter_form_validate' => array())
+      );
     }
     return $form;
   }
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index c22eb7bbe..4f793a07d 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -762,7 +762,15 @@ 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' => 'radio', '#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');
+      $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' => array('filter_form_validate' => array())
+      );
     }
     return $form;
   }
diff --git a/modules/system.module b/modules/system.module
index bebf6e876..60c6b750a 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -64,12 +64,12 @@ function system_elements() {
   $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);
-  $type['radios'] = array('#input' => TRUE, '#process' => 'expand_radios');
+  $type['radios'] = array('#input' => TRUE, '#process' => array('expand_radios' => array()));
   $type['radio'] = array('#input' => TRUE);
-  $type['checkboxes'] = array('#input' => TRUE, '#process' => 'expand_checkboxes', '#tree' => TRUE);
+  $type['checkboxes'] = array('#input' => TRUE, '#process' => array('expand_checkboxes' => array()), '#tree' => TRUE);
   $type['select'] = array('#input' => TRUE);
   $type['weight'] = array('#input' => TRUE, '#delta' => 10);
-  $type['date'] = array('#input' => TRUE, '#process' => 'expand_date');
+  $type['date'] = array('#input' => TRUE, '#process' => array('expand_date' => array()));
   $type['file'] = array('#input' => TRUE, '#size' => 60);
 
   // Form structure
diff --git a/modules/system/system.module b/modules/system/system.module
index bebf6e876..60c6b750a 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -64,12 +64,12 @@ function system_elements() {
   $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);
-  $type['radios'] = array('#input' => TRUE, '#process' => 'expand_radios');
+  $type['radios'] = array('#input' => TRUE, '#process' => array('expand_radios' => array()));
   $type['radio'] = array('#input' => TRUE);
-  $type['checkboxes'] = array('#input' => TRUE, '#process' => 'expand_checkboxes', '#tree' => TRUE);
+  $type['checkboxes'] = array('#input' => TRUE, '#process' => array('expand_checkboxes' => array()), '#tree' => TRUE);
   $type['select'] = array('#input' => TRUE);
   $type['weight'] = array('#input' => TRUE, '#delta' => 10);
-  $type['date'] = array('#input' => TRUE, '#process' => 'expand_date');
+  $type['date'] = array('#input' => TRUE, '#process' => array('expand_date' => array()));
   $type['file'] = array('#input' => TRUE, '#size' => 60);
 
   // Form structure