- Patch #831914 by Dave Reid: removed redundant/duplicate [node:uid], [comment:uid], and [file:uid] tokens.

2 files changed, 1 insertions, 9 deletions

diff --git a/modules/node/node.test b/modules/node/node.test
index 629509c7a..7369b8699 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1730,7 +1730,6 @@ class NodeTokenReplaceTestCase extends DrupalWebTestCase {
     $tests['[node:nid]'] = $node->nid;
     $tests['[node:vid]'] = $node->vid;
     $tests['[node:tnid]'] = $node->tnid;
-    $tests['[node:uid]'] = $node->uid;
     $tests['[node:type]'] = 'article';
     $tests['[node:type-name]'] = 'Article';
     $tests['[node:title]'] = check_plain($node->title);
@@ -1739,6 +1738,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:uid]'] = $node->uid;
     $tests['[node:author:name]'] = check_plain($account->name);
     $tests['[node:created:since]'] = format_interval(REQUEST_TIME - $node->created, 2, $language->language);
     $tests['[node:changed:since]'] = format_interval(REQUEST_TIME - $node->changed, 2, $language->language);
diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc
index c28e5347e..be064ab29 100644
--- a/modules/node/node.tokens.inc
+++ b/modules/node/node.tokens.inc
@@ -31,10 +31,6 @@ function node_token_info() {
     'name' => t("Translation set ID"),
     'description' => t("The unique ID of the original-language version of this node, if one exists."),
   );
-  $node['uid'] = array(
-    'name' => t("User ID"),
-    'description' => t("The unique ID of the user who posted the node."),
-  );
   $node['type'] = array(
     'name' => t("Content type"),
     'description' => t("The type of the node."),
@@ -125,10 +121,6 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
           $replacements[$original] = $node->tnid;
           break;
 
-        case 'uid':
-          $replacements[$original] = $node->uid;
-          break;
-
         case 'type':
           $replacements[$original] = $sanitize ? check_plain($node->type) : $node->type;
           break;