diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-01 23:38:23 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-10-01 23:38:23 -0700 |
| commit | f3268d135d0d33c4ca93721ea1a7d426f4fd0427 (patch) | |
| tree | 4aee4310061cdbce4a16df480391b9e513964d25 /modules/node | |
| parent | de26c88c28367668c1a779a13925d31ea5ee35d0 (diff) | |
| download | brdo-f3268d135d0d33c4ca93721ea1a7d426f4fd0427.tar.gz brdo-f3268d135d0d33c4ca93721ea1a7d426f4fd0427.tar.bz2 | |
Issue #1178580 by Dave Reid: Fixed PHP notices with [node:summary], [node:body], or [comment:body] if there is no body field or language mismatch.
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.tokens.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc index b6bafc639..491ec81c4 100644 --- a/modules/node/node.tokens.inc +++ b/modules/node/node.tokens.inc @@ -135,11 +135,11 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr case 'body': case 'summary': - if (!empty($node->body)) { - $item = $node->body[$node->language][0]; + if ($items = field_get_items('node', $node, 'body', $language_code)) { $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]; + $field_langcode = field_language('node', $node, 'body', $language_code); + $replacements[$original] = $sanitize ? _text_sanitize($instance, $field_langcode, $items[0], $column) : $items[0][$column]; } break; |