summaryrefslogtreecommitdiff
path: root/modules/taxonomy
diff options
context:
space:
mode:
Diffstat (limited to 'modules/taxonomy')
-rw-r--r--modules/taxonomy/taxonomy.module19
-rw-r--r--modules/taxonomy/taxonomy.pages.inc2
-rw-r--r--modules/taxonomy/taxonomy.tokens.inc2
3 files changed, 3 insertions, 20 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index b04336fa0..613383a90 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -164,23 +164,6 @@ function taxonomy_theme() {
}
/**
- * For vocabularies not maintained by taxonomy.module, give the maintaining
- * module a chance to provide a path for terms in that vocabulary.
- *
- * @param $term
- * A term object.
- * @return
- * An internal Drupal path.
- */
-function taxonomy_term_path($term) {
- $vocabulary = taxonomy_vocabulary_load($term->vid);
- if ($vocabulary->module != 'taxonomy' && $path = module_invoke($vocabulary->module, 'term_path', $term)) {
- return $path;
- }
- return 'taxonomy/term/' . $term->tid;
-}
-
-/**
* Implement hook_menu().
*/
function taxonomy_menu() {
@@ -1103,7 +1086,7 @@ function taxonomy_field_formatter_info() {
function theme_field_formatter_taxonomy_term_link($variables) {
$term = $variables['element']['#item']['taxonomy_term'];
$attributes = empty($variables['link_options']) ? array() : $variables['link_options'];
- return l($term->name, taxonomy_term_path($term), $attributes);
+ return l($term->name, 'taxonomy/term/' . $term->tid, $attributes);
}
/**
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc
index eadbd9cf3..90ff994f0 100644
--- a/modules/taxonomy/taxonomy.pages.inc
+++ b/modules/taxonomy/taxonomy.pages.inc
@@ -22,7 +22,7 @@ function taxonomy_term_page($term) {
$breadcrumb = array();
while ($parents = taxonomy_get_parents($current->tid)) {
$current = array_shift($parents);
- $breadcrumb[] = l($current->name, taxonomy_term_path($current));
+ $breadcrumb[] = l($current->name, 'taxonomy/term/' . $current->tid);
}
$breadcrumb[] = l(t('Home'), NULL);
$breadcrumb = array_reverse($breadcrumb);
diff --git a/modules/taxonomy/taxonomy.tokens.inc b/modules/taxonomy/taxonomy.tokens.inc
index f2ee1aac9..c7d92ce46 100644
--- a/modules/taxonomy/taxonomy.tokens.inc
+++ b/modules/taxonomy/taxonomy.tokens.inc
@@ -119,7 +119,7 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
break;
case 'url':
- $replacements[$original] = url(taxonomy_term_path($term), array('absolute' => TRUE));
+ $replacements[$original] = url('taxonomy/term/' . $term, array('absolute' => TRUE));
break;
case 'node-count':