From 1459b27e0c5b594aaf811510528d432ee743c2f9 Mon Sep 17 00:00:00 2001
From: Bob Vincent <bobvin@pillars.net>
Date: Sun, 11 Sep 2011 12:29:19 -0400
Subject: [PATCH] Issue #1002734  by yched: Fix multiple undefined index
 errors when "Unformatted" number formatter is used.

---
 modules/field/modules/number/number.module |   44 ++++++++++++++--------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index fd536730836f5821123e4f682a466de40f15558b..11291421593f931b7810c05664efc15bfdb06bc6 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -215,20 +215,19 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
 
-  $options = array(
-    ''  => t('<none>'),
-    '.' => t('Decimal point'),
-    ',' => t('Comma'),
-    ' ' => t('Space'),
-  );
-  $element['thousand_separator'] = array(
-    '#type' => 'select',
-    '#title' => t('Thousand marker'),
-    '#options' => $options,
-    '#default_value' => $settings['thousand_separator'],
-  );
-
   if ($display['type'] == 'number_decimal' || $display['type'] == 'number_float') {
+    $options = array(
+      ''  => t('<none>'),
+      '.' => t('Decimal point'),
+      ',' => t('Comma'),
+      ' ' => t('Space'),
+    );
+    $element['thousand_separator'] = array(
+      '#type' => 'select',
+      '#title' => t('Thousand marker'),
+      '#options' => $options,
+      '#default_value' => $settings['thousand_separator'],
+    );
     $element['decimal_separator'] = array(
       '#type' => 'select',
       '#title' => t('Decimal marker'),
@@ -242,14 +241,13 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
       '#default_value' => $settings['scale'],
       '#description' => t('The number of digits to the right of the decimal.'),
     );
+    $element['prefix_suffix'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Display prefix and suffix.'),
+      '#default_value' => $settings['prefix_suffix'],
+    );
   }
 
-  $element['prefix_suffix'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Display prefix and suffix.'),
-    '#default_value' => $settings['prefix_suffix'],
-  );
-
   return $element;
 }
 
@@ -261,9 +259,11 @@ function number_field_formatter_settings_summary($field, $instance, $view_mode)
   $settings = $display['settings'];
 
   $summary = array();
-  $summary[] = number_format(1234.1234567890, $settings['scale'], $settings['decimal_separator'], $settings['thousand_separator']);
-  if ($settings['prefix_suffix']) {
-    $summary[] = t('Display with prefix and suffix.');
+  if ($display['type'] == 'number_decimal' || $display['type'] == 'number_float') {
+    $summary[] = number_format(1234.1234567890, $settings['scale'], $settings['decimal_separator'], $settings['thousand_separator']);
+    if ($settings['prefix_suffix']) {
+      $summary[] = t('Display with prefix and suffix.');
+    }
   }
 
   return implode('<br />', $summary);
-- 
1.7.5.4