From 9d8799f6c4e92ec62133e0ed3aab7b0378e13ee7 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Tue, 16 May 2006 06:50:21 +0000
Subject: [PATCH] Reverting #53653, that function actually is called via a
module_invoke() in node.module.
---
modules/taxonomy.module | 20 ++++++++++++++++++++
modules/taxonomy/taxonomy.module | 20 ++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index dc0600f9695f..29ccd3ae0aed 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -548,6 +548,26 @@ function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
}
+/**
+ * Generate a set of options for selecting a term from all vocabularies. Can be
+ * passed to form_select.
+ */
+function taxonomy_form_all($free_tags = 0) {
+ $vocabularies = taxonomy_get_vocabularies();
+ $options = array();
+ foreach ($vocabularies as $vid => $vocabulary) {
+ if ($vocabulary->tags && !$free_tags) { continue; }
+ $tree = taxonomy_get_tree($vid);
+ $options[$vocabulary->name] = array();
+ if ($tree) {
+ foreach ($tree as $term) {
+ $options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name;
+ }
+ }
+ }
+ return $options;
+}
+
/**
* Return an array of all vocabulary objects.
*
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index dc0600f9695f..29ccd3ae0aed 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -548,6 +548,26 @@ function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
}
+/**
+ * Generate a set of options for selecting a term from all vocabularies. Can be
+ * passed to form_select.
+ */
+function taxonomy_form_all($free_tags = 0) {
+ $vocabularies = taxonomy_get_vocabularies();
+ $options = array();
+ foreach ($vocabularies as $vid => $vocabulary) {
+ if ($vocabulary->tags && !$free_tags) { continue; }
+ $tree = taxonomy_get_tree($vid);
+ $options[$vocabulary->name] = array();
+ if ($tree) {
+ foreach ($tree as $term) {
+ $options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name;
+ }
+ }
+ }
+ return $options;
+}
+
/**
* Return an array of all vocabulary objects.
*
--
GitLab