Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.54
diff -u -p -r1.54 text.module
--- modules/field/modules/text/text.module	6 May 2010 05:59:31 -0000	1.54
+++ modules/field/modules/text/text.module	24 May 2010 17:19:09 -0000
@@ -271,23 +271,24 @@ function text_field_formatter_view($enti
   switch ($display['type']) {
     case 'text_default':
     case 'text_trimmed':
+      $size = variable_get('teaser_length_' . $instance['bundle'], 600);
       foreach ($items as $delta => $item) {
         $output = _text_sanitize($instance, $langcode, $item, 'value');
         if ($display['type'] == 'text_trimmed') {
-          $output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL);
+          $output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL, $size);
         }
         $element[$delta] = array('#markup' => $output);
       }
       break;
 
     case 'text_summary_or_trimmed':
+      $size = variable_get('teaser_length_' . $instance['bundle'], 600);
       foreach ($items as $delta => $item) {
         if (!empty($item['summary'])) {
           $output = _text_sanitize($instance, $langcode, $item, 'summary');
         }
         else {
           $output = _text_sanitize($instance, $langcode, $item, 'value');
-          $size = variable_get('teaser_length_' . $instance['bundle'], 600);
           $output = text_summary($output, $instance['settings']['text_processing'] ? $item['format'] : NULL, $size);
         }
         $element[$delta] = array('#markup' => $output);