*** modules/node/node.tokens.inc.orig	Thu Sep  1 18:46:25 2011
--- modules/node/node.tokens.inc	Fri Oct 21 12:12:50 2011
*************** function node_tokens($type, $tokens, arr
*** 136,142 ****
          case 'body':
          case 'summary':
            if (!empty($node->body)) {
!             $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];
--- 136,147 ----
          case 'body':
          case 'summary':
            if (!empty($node->body)) {
!             if (!empty($node->body[$node->language])) {
!               $item = $node->body[$node->language][0];
!             }
!             else {
!               $item = NULL;
!             }
              $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];