diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-06-29 00:57:19 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-06-29 00:57:19 +0000 |
| commit | b6c0d1ab208af3cd16316324f54d2e10875b5286 (patch) | |
| tree | f569d6bf46c680a867e5c838b91be00659a32265 /modules/comment/comment.test | |
| parent | cbfdd2e9c7bc67f374ecb434369111d630399fea (diff) | |
| download | brdo-b6c0d1ab208af3cd16316324f54d2e10875b5286.tar.gz brdo-b6c0d1ab208af3cd16316324f54d2e10875b5286.tar.bz2 | |
- Patch #831914 by Dave Reid: removed redundant/duplicate [node:uid], [comment:uid], and [file:uid] tokens.
Diffstat (limited to 'modules/comment/comment.test')
| -rw-r--r-- | modules/comment/comment.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/comment/comment.test b/modules/comment/comment.test index 03cc74ba7..ae680cecd 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -1187,9 +1187,6 @@ class CommentTokenReplaceTestCase extends CommentHelperCase { // Generate and test sanitized tokens. $tests = array(); $tests['[comment:cid]'] = $comment->cid; - $tests['[comment:pid]'] = $comment->pid; - $tests['[comment:nid]'] = $comment->nid; - $tests['[comment:uid]'] = $comment->uid; $tests['[comment:hostname]'] = check_plain($comment->hostname); $tests['[comment:name]'] = filter_xss($comment->name); $tests['[comment:mail]'] = check_plain($this->admin_user->mail); @@ -1200,8 +1197,11 @@ class CommentTokenReplaceTestCase extends CommentHelperCase { $tests['[comment:edit-url]'] = url('comment/' . $comment->cid . '/edit', $url_options); $tests['[comment:created:since]'] = format_interval(REQUEST_TIME - $comment->created, 2, $language->language); $tests['[comment:changed:since]'] = format_interval(REQUEST_TIME - $comment->changed, 2, $language->language); + $tests['[comment:parent:cid]'] = $comment->pid; $tests['[comment:parent:title]'] = check_plain($parent_comment->subject); + $tests['[comment:node:nid]'] = $comment->nid; $tests['[comment:node:title]'] = check_plain($node->title); + $tests['[comment:author:uid]'] = $comment->uid; $tests['[comment:author:name]'] = check_plain($this->admin_user->name); // Test to make sure that we generated something for each token. |