Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.79
diff -u -r1.79 content_types.inc
--- modules/node/content_types.inc	1 Jul 2009 12:10:32 -0000	1.79
+++ modules/node/content_types.inc	2 Jul 2009 16:13:37 -0000
@@ -182,13 +182,18 @@
     '#default_value' => variable_get('node_submitted_' . $type->type, TRUE),
     '#description' => t('Enable the <em>submitted by Username on date</em> text.'),
   );
-  $form['display']['teaser_length'] = array(
-    '#type' => 'select', 
-    '#title' => t('Length of trimmed posts'),
-    '#default_value' => variable_get('teaser_length_' . $type->type, 600),
-    '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
-    '#description' => t("The maximum number of characters used in the trimmed version of a post. Drupal will use this setting to determine at which offset long posts should be trimmed. The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc. To disable teasers, set to 'Unlimited'.")
-  );
+  // We don't need a teaser length if the content type has no body
+  if ($type->has_body) {
+    $instance = field_info_instance('body', $type->type);
+    $summary_length = isset($instance['display']['teaser']['settings']['summary_length']) ? $instance['display']['teaser']['settings']['summary_length'] : 600;
+    $form['display']['teaser_length'] = array(
+      '#type' => 'select', 
+      '#title' => t('Length of trimmed posts'),
+      '#default_value' => $summary_length,
+      '#options' => drupal_map_assoc(array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000), '_node_characters'),
+      '#description' => t("The maximum number of characters used in the trimmed version of a post. Drupal will use this setting to determine at which offset long posts should be trimmed. The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc. To disable teasers, set to 'Unlimited'.")
+    );
+  }
   $form['old_type'] = array(
     '#type' => 'value',
     '#value' => $type->type,
@@ -309,6 +314,7 @@
   $type->custom = $form_state['values']['custom'];
   $type->modified = TRUE;
   $type->locked = $form_state['values']['locked'];
+  $type->summary_length = $form_state['values']['teaser_length'];
 
   if ($op == t('Reset to defaults')) {
     node_type_reset($type);
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1077
diff -u -r1.1077 node.module
--- modules/node/node.module	2 Jul 2009 04:27:23 -0000	1.1077
+++ modules/node/node.module	2 Jul 2009 16:13:38 -0000
@@ -468,7 +468,7 @@
         'settings' => array('display_summary' => TRUE),
 
         // With no UI in core, we have to define default
-        // formatters for the teaser and full view.
+        // formatters for the rss, teaser and full view.
         // This may change if the method of handling displays
         // is changed or if a UI gets into core.
         'display' => array(
@@ -479,6 +479,12 @@
           'teaser' => array(
             'label' => 'hidden',
             'type' => 'text_summary_or_trimmed',
+            'settings' => array('summary_length' => $type->summary_length),
+          ),
+          'rss' => array(
+            'label' => 'hidden',
+            'type' => 'text_summary_or_trimmed',
+            'settings' => array('summary_length' => $type->summary_length),
           ),
         ),
       );
@@ -487,6 +493,8 @@
     else {
       $instance['label'] = $type->body_label;
       $instance['settings']['display_summary'] = TRUE;
+      $instance['display']['teaser']['settings']['summary_length'] = $type->summary_length;
+      $instance['display']['rss']['settings']['summary_length'] = $type->summary_length;
       field_update_instance($instance);
     }
   }
@@ -610,6 +618,7 @@
     $type->modified = 0;
     $type->locked = 1;
     $type->is_new = 1;
+	$type->summary_length = 600;
   }
 
   $new_type = clone $type;
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.24
diff -u -r1.24 node.install
--- modules/node/node.install	18 Jun 2009 15:46:30 -0000	1.24
+++ modules/node/node.install	2 Jul 2009 16:13:37 -0000
@@ -523,7 +523,24 @@
   return $ret;
 }
 
+/**
+ * Move summary length from variable table to the body field data.
+ */
+function node_update_7006() {
+
+  // Get node type info for every invocation.
+  node_type_clear();
+  $node_types = node_type_get_types();
+  $body_types = array();
+  foreach ($node_types as $type => $info) {
+    if ($info->has_body) {
+      $info->summary_length = variable_get('teaser_length_' . $info->type, 600);
+      node_type_save($info);
+    }
+  }
 
+  return array();
+}
 
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.14
diff -u -r1.14 text.module
--- modules/field/modules/text/text.module	1 Jul 2009 12:10:32 -0000	1.14
+++ modules/field/modules/text/text.module	2 Jul 2009 16:13:37 -0000
@@ -214,9 +214,9 @@
         }
       }
       else {
-        $item[$delta]['safe'] = check_plain($item['value']);
+        $items[$delta]['safe'] = check_plain($item['value']);
         if ($field['type'] == 'text_with_summary') {
-          $item[$delta]['safe_summary'] = check_plain($item['summary']);
+          $items[$delta]['safe_summary'] = check_plain($item['summary']);
         }
       }
     }
@@ -261,6 +261,7 @@
     'text_trimmed' => array(
       'label' => t('Trimmed'),
       'field types' => array('text', 'text_long', 'text_with_summary'),
+      'settings' => array('summary_length' => 600),
       'behaviors' => array(
         'multiple values' => FIELD_BEHAVIOR_DEFAULT,
       ),
@@ -273,6 +274,7 @@
     'text_summary_or_trimmed' => array(
       'label' => t('Summary or trimmed'),
       'field types' => array('text_with_summary'),
+      'settings' => array('summary_length' => 600),
       'behaviors' => array(
         'multiple values' => FIELD_BEHAVIOR_DEFAULT,
       ),
@@ -300,7 +302,8 @@
 function theme_field_formatter_text_trimmed($element) {
   $field = field_info_field($element['#field_name']);
   $instance = field_info_instance($element['#field_name'], $element['#bundle']);
-  return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL);
+  $size = $element['#settings']['summary_length'];
+  return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL, $size);
 }
 
 /**
@@ -317,7 +320,7 @@
     return $element['#item']['safe_summary'];
   }
   else {
-    $size = variable_get('teaser_length_' . $element['#bundle'], 600);
+    $size = $element['#settings']['summary_length'];
     return text_summary($element['#item']['safe'], $instance['settings']['text_processing'] ? $element['#item']['format'] : NULL, $size);
   }
 }