Index: modules/node/node.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tokens.inc,v
retrieving revision 1.11
diff -u -p -r1.11 node.tokens.inc
--- modules/node/node.tokens.inc	14 Jan 2010 05:53:55 -0000	1.11
+++ modules/node/node.tokens.inc	9 Apr 2010 00:53:09 -0000
@@ -139,13 +139,13 @@ function node_tokens($type, $tokens, arr
 
         case 'body':
           if (!empty($node->body)) {
-            $replacements[$original] = $sanitize ? $node->body[LANGUAGE_NONE][0]['safe'] : $node->body[LANGUAGE_NONE][0]['value'];
+            $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[LANGUAGE_NONE][0]['safe_summary'] : $node->body[LANGUAGE_NONE][0]['summary'];
+            $replacements[$original] = $sanitize ? $node->body[$node->language][0]['safe_summary'] : $node->body[$node->language][0]['summary'];
           }
           break;