Commit 17482ee1 authored by Dries's avatar Dries
Browse files

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

parent 0ed7c505
...@@ -993,7 +993,6 @@ class TaxonomyTokenReplaceTestCase extends TaxonomyWebTestCase { ...@@ -993,7 +993,6 @@ class TaxonomyTokenReplaceTestCase extends TaxonomyWebTestCase {
// Generate and test sanitized tokens. // Generate and test sanitized tokens.
$tests = array(); $tests = array();
$tests['[term:tid]'] = $term2->tid; $tests['[term:tid]'] = $term2->tid;
$tests['[term:vid]'] = $term2->vid;
$tests['[term:name]'] = check_plain($term2->name); $tests['[term:name]'] = check_plain($term2->name);
$tests['[term:description]'] = check_markup($term2->description, $term2->format); $tests['[term:description]'] = check_markup($term2->description, $term2->format);
$tests['[term:url]'] = url('taxonomy/term/' . $term2->tid, array('absolute' => TRUE)); $tests['[term:url]'] = url('taxonomy/term/' . $term2->tid, array('absolute' => TRUE));
......
...@@ -26,10 +26,6 @@ function taxonomy_token_info() { ...@@ -26,10 +26,6 @@ function taxonomy_token_info() {
'name' => t("Term ID"), 'name' => t("Term ID"),
'description' => t("The unique ID of the taxonomy term."), '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( $term['name'] = array(
'name' => t("Name"), 'name' => t("Name"),
'description' => t("The name of the taxonomy term."), 'description' => t("The name of the taxonomy term."),
...@@ -106,10 +102,6 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options = ...@@ -106,10 +102,6 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
$replacements[$original] = $term->tid; $replacements[$original] = $term->tid;
break; break;
case 'vid':
$replacements[$original] = $term->vid;
break;
case 'name': case 'name':
$replacements[$original] = $sanitize ? check_plain($term->name) : $term->name; $replacements[$original] = $sanitize ? check_plain($term->name) : $term->name;
break; break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment