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

modules/taxonomy/taxonomy.test

@@ -993,7 +993,6 @@ class TaxonomyTokenReplaceTestCase extends TaxonomyWebTestCase {
     // Generate and test sanitized tokens.
     $tests = array();
     $tests['[term:tid]'] = $term2->tid;
-    $tests['[term:vid]'] = $term2->vid;
     $tests['[term:name]'] = check_plain($term2->name);
     $tests['[term:description]'] = check_markup($term2->description, $term2->format);
     $tests['[term:url]'] = url('taxonomy/term/' . $term2->tid, array('absolute' => TRUE));

modules/taxonomy/taxonomy.tokens.inc

@@ -26,10 +26,6 @@ function taxonomy_token_info() {
     'name' => t("Term ID"),
     'description' => t("The unique ID of the taxonomy term."),
   );
-  $term['vid'] = array(
-    'name' => t("Vocabulary ID"),
-    'description' => t("The unique ID of the vocabulary the term belongs to."),
-  );
   $term['name'] = array(
     'name' => t("Name"),
     'description' => t("The name of the taxonomy term."),
@@ -106,10 +102,6 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
           $replacements[$original] = $term->tid;
           break;
 
-        case 'vid':
-          $replacements[$original] = $term->vid;
-          break;
-
         case 'name':
           $replacements[$original] = $sanitize ? check_plain($term->name) : $term->name;
           break;