From 2df43894e2f24cb6a39e6cf11a3b39f3c4b70193 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 28 May 2009 16:44:07 +0000
Subject: #306358 by dvessel, JohnAlbin, and flobruit: Add a single $classes
 string (and corresponding $classes_array) for all dynamic classes in template
 files.

---
 modules/field/modules/number/number.module   |  4 ++--
 modules/field/modules/options/options.module | 12 ++++++------
 modules/field/modules/text/text.module       |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules/field')

diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index 15daaa504..108ed65f7 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -239,7 +239,7 @@ function number_elements() {
     'number' => array(
       '#input' => TRUE,
       '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('number_process'),
+      '#process' => array('number_elements_process'),
     ),
   );
 }
@@ -296,7 +296,7 @@ function number_field_widget_error($element, $error) {
  *
  * The $field and $instance arrays are in $form['#fields'][$element['#field_name']].
  */
-function number_process($element, $form_state, $form) {
+function number_elements_process($element, $form_state, $form) {
   $field_name = $element['#field_name'];
   $field = field_info_field($element['#field_name']);
   $instance = field_info_instance($element['#field_name'], $element['#bundle']);
diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module
index 05f02d1ba..6489ebb56 100644
--- a/modules/field/modules/options/options.module
+++ b/modules/field/modules/options/options.module
@@ -83,17 +83,17 @@ function options_elements() {
     'options_select' => array(
       '#input' => TRUE,
       '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('options_select_process'),
+      '#process' => array('options_select_elements_process'),
       ),
     'options_buttons' => array(
       '#input' => TRUE,
       '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('options_buttons_process'),
+      '#process' => array('options_buttons_elements_process'),
       ),
     'options_onoff' => array(
       '#input' => TRUE,
       '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('options_onoff_process'),
+      '#process' => array('options_onoff_elements_process'),
       ),
     );
 }
@@ -125,7 +125,7 @@ function options_field_widget_error($element, $error) {
  *
  * The $field and $instance arrays are in $form['#fields'][$element['#field_name']].
  */
-function options_buttons_process($element, &$form_state, $form) {
+function options_buttons_elements_process($element, &$form_state, $form) {
   $field = $form['#fields'][$element['#field_name']]['field'];
   $instance = $form['#fields'][$element['#field_name']]['instance'];
   $field_key  = $element['#columns'][0];
@@ -182,7 +182,7 @@ function options_buttons_process($element, &$form_state, $form) {
  *
  * The $field and $instance arrays are in $form['#fields'][$element['#field_name']].
  */
-function options_select_process($element, &$form_state, $form) {
+function options_select_elements_process($element, &$form_state, $form) {
   $field = $form['#fields'][$element['#field_name']]['field'];
   $instance = $form['#fields'][$element['#field_name']]['instance'];
   $field_key  = $element['#columns'][0];
@@ -223,7 +223,7 @@ function options_select_process($element, &$form_state, $form) {
  * Build the form element. When creating a form using FAPI #process,
  * note that $element['#value'] is already set.
  */
-function options_onoff_process($element, &$form_state, $form) {
+function options_onoff_elements_process($element, &$form_state, $form) {
   $field = $form['#fields'][$element['#field_name']]['field'];
   $instance = $form['#fields'][$element['#field_name']]['instance'];
   $field_key  = $element['#columns'][0];
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index 709c31185..b6eba9f12 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -238,13 +238,13 @@ function text_elements() {
     'text_textfield' => array(
       '#input' => TRUE,
       '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('text_textfield_process'),
+      '#process' => array('text_textfield_elements_process'),
       '#autocomplete_path' => FALSE,
       ),
     'text_textarea' => array(
       '#input' => TRUE,
       '#columns' => array('value', 'format'), '#delta' => 0,
-      '#process' => array('text_textarea_process'),
+      '#process' => array('text_textarea_elements_process'),
       '#filter_value' => FILTER_FORMAT_DEFAULT,
       ),
   );
@@ -310,7 +310,7 @@ function text_field_widget_error($element, $error) {
  * information needed to adjust the behavior of the 'element' should be
  * extracted in hook_field_widget() above.
  */
-function text_textfield_process($element, $form_state, $form) {
+function text_textfield_elements_process($element, $form_state, $form) {
   $field = $form['#fields'][$element['#field_name']]['field'];
   $instance = $form['#fields'][$element['#field_name']]['instance'];
   $field_key = $element['#columns'][0];
@@ -353,7 +353,7 @@ function text_textfield_process($element, $form_state, $form) {
  *
  * The $field and $instance arrays are in $form['#fields'][$element['#field_name']].
  */
-function text_textarea_process($element, $form_state, $form) {
+function text_textarea_elements_process($element, $form_state, $form) {
   $field = $form['#fields'][$element['#field_name']]['field'];
   $instance = $form['#fields'][$element['#field_name']]['instance'];
   $field_key = $element['#columns'][0];
-- 
cgit v1.2.3