From 51dc073b02c3fe544e97ec32518557f99d62a6ba Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 15 Apr 2010 02:42:08 +0000
Subject: [PATCH] #609118 folllow-up by plach: Fixed node.tokens.inc: node body
 issues.

---
 modules/node/node.tokens.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc
index b0d682841ca..da6472e0b26 100644
--- a/modules/node/node.tokens.inc
+++ b/modules/node/node.tokens.inc
@@ -139,13 +139,13 @@ function node_tokens($type, $tokens, array $data = array(), array $options = 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;