diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-20 07:59:59 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-20 07:59:59 +0000 |
| commit | 8eefdd5b7781c93284823589540700ae4ee70f4c (patch) | |
| tree | 637bee2b2397d7c54f039df55fb0aa20725ff545 /modules | |
| parent | 2e12586932d04b3d1efc2f353f88848cf5460bc7 (diff) | |
| download | brdo-8eefdd5b7781c93284823589540700ae4ee70f4c.tar.gz brdo-8eefdd5b7781c93284823589540700ae4ee70f4c.tar.bz2 | |
#609118 by plach, te-brian, David_Rothstein, yched: Fixed node.tokens.inc: node->body issues.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node/node.tokens.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc index da6472e0b..4473088eb 100644 --- a/modules/node/node.tokens.inc +++ b/modules/node/node.tokens.inc @@ -138,14 +138,12 @@ function node_tokens($type, $tokens, array $data = array(), array $options = 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; |