From f31d0d3a4983af989687661cf14967dac86f27b3 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 22 Oct 2010 00:42:42 +0000
Subject: - Patch #948584 by yched: wrong implementations of
 hook_field_formatter_settings_form().

---
 modules/field/modules/number/number.module | 10 +++++-----
 modules/field/modules/text/text.module     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/field')

diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index cf31d1b27..1f6ac7f89 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -222,7 +222,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
     ',' => t('Comma'),
     ' ' => t('Space'),
   );
-  $form['thousand_separator'] = array(
+  $element['thousand_separator'] = array(
     '#type' => 'select',
     '#title' => t('Thousand marker'),
     '#options' => $options,
@@ -230,13 +230,13 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
   );
 
   if ($display['type'] == 'number_decimal' || $display['type'] == 'number_float') {
-    $form['decimal_separator'] = array(
+    $element['decimal_separator'] = array(
       '#type' => 'select',
       '#title' => t('Decimal marker'),
       '#options' => array('.' => t('Decimal point'), ',' => t('Comma')),
       '#default_value' => $settings['decimal_separator'],
     );
-    $form['scale'] = array(
+    $element['scale'] = array(
       '#type' => 'select',
       '#title' => t('Scale'),
       '#options' => drupal_map_assoc(range(0, 10)),
@@ -245,13 +245,13 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
     );
   }
 
-  $form['prefix_suffix'] = array(
+  $element['prefix_suffix'] = array(
     '#type' => 'checkbox',
     '#title' => t('Display prefix and suffix.'),
     '#default_value' => $settings['prefix_suffix'],
   );
 
-  return $form;
+  return $element;
 }
 
 /**
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index 16de61de5..59425cb82 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -220,10 +220,10 @@ function text_field_formatter_settings_form($field, $instance, $view_mode, $form
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
 
-  $form = array();
+  $element = array();
 
   if (strpos($display['type'], '_trimmed') !== FALSE) {
-    $form['trim_length'] = array(
+    $element['trim_length'] = array(
       '#title' => t('Trim length'),
       '#type' => 'textfield',
       '#size' => 10,
@@ -233,7 +233,7 @@ function text_field_formatter_settings_form($field, $instance, $view_mode, $form
     );
   }
 
-  return $form;
+  return $element;
 }
 
 /**
-- 
cgit v1.2.3