diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-09-11 18:43:22 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-09-11 18:43:22 -0400 |
| commit | dcea6ffb1bacaa050f0d2a0d2656c075c8fc94ea (patch) | |
| tree | 29dd25de82dd8240bb49fa8eb86da2cb17f377b0 | |
| parent | 5e1df952ebbc7f49d6c6ede1fb15e338fd6d29b3 (diff) | |
| download | brdo-dcea6ffb1bacaa050f0d2a0d2656c075c8fc94ea.tar.gz brdo-dcea6ffb1bacaa050f0d2a0d2656c075c8fc94ea.tar.bz2 | |
- Patch #1185842 by Dave Reid: the [node:author] token does not use format_username().
| -rw-r--r-- | modules/node/node.test | 1 | ||||
| -rw-r--r-- | modules/node/node.tokens.inc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/node/node.test b/modules/node/node.test index 56a2d3426..8a1899eb3 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -2270,6 +2270,7 @@ class NodeTokenReplaceTestCase extends DrupalWebTestCase { $tests['[node:language]'] = check_plain($node->language); $tests['[node:url]'] = url('node/' . $node->nid, $url_options); $tests['[node:edit-url]'] = url('node/' . $node->nid . '/edit', $url_options); + $tests['[node:author]'] = check_plain(format_username($account)); $tests['[node:author:uid]'] = $node->uid; $tests['[node:author:name]'] = check_plain(format_username($account)); $tests['[node:created:since]'] = format_interval(REQUEST_TIME - $node->created, 2, $language->language); diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc index 80dbda517..b6bafc639 100644 --- a/modules/node/node.tokens.inc +++ b/modules/node/node.tokens.inc @@ -157,8 +157,9 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr // Default values for the chained tokens handled below. case 'author': - $name = ($node->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $node->name; - $replacements[$original] = $sanitize ? filter_xss($name) : $name; + $account = user_load($node->uid); + $name = format_username($account); + $replacements[$original] = $sanitize ? check_plain($name) : $name; break; case 'created': |