? .settings
Index: modules/node/node.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tokens.inc,v
retrieving revision 1.12
diff -u -p -r1.12 node.tokens.inc
--- modules/node/node.tokens.inc	15 Apr 2010 02:42:08 -0000	1.12
+++ modules/node/node.tokens.inc	15 Apr 2010 12:46:17 -0000
@@ -138,14 +138,12 @@ function node_tokens($type, $tokens, arr
           break;
 
         case 'body':
-          if (!empty($node->body)) {
-            $replacements[$original] = $sanitize ? $node->body[$node->language][0]['safe'] : $node->body[$node->language][0]['value'];
-          }
-          break;
-
         case 'summary':
           if (!empty($node->body)) {
-            $replacements[$original] = $sanitize ? $node->body[$node->language][0]['safe_summary'] : $node->body[$node->language][0]['summary'];
+            $item = $node->body[$node->language][0];
+            $column = ($name == 'body') ? 'value' : 'summary';
+            $instance = field_info_instance('node', 'body', $node->type);
+            $replacements[$original] = $sanitize ? _text_sanitize($instance, $node->language, $item, $column) : $item[$column];
           }
           break;