From 1482a565969df73e0b0d8d7abb1b45bf91e08fdb Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 8 Jul 2003 09:51:22 +0000
Subject: [PATCH] - Usability improvement and bugfix for translation issue with
 the taxonomy   module.  Patch #70 by Stefan.

---
 modules/taxonomy.module          | 5 +++--
 modules/taxonomy/taxonomy.module | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 567a8e5e3ff..ba6afc054c2 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -70,7 +70,7 @@ function taxonomy_link($type, $node = NULL) {
 function taxonomy_form_vocabulary($edit = array()) {
   foreach (module_list() as $name) {
     if (module_hook($name, "node")) {
-      $nodetypes[$name] = $name;
+      $nodetypes[$name] = module_invoke($name, "node", "name");
     }
   }
 
@@ -280,9 +280,10 @@ function taxonomy_overview() {
   $header = array(t("name"), t("node types"), array("data" => t("operations"), "colspan" => 3));
 
   $vocabularies = taxonomy_get_vocabularies();
+
   foreach ($vocabularies as $vocabulary) {
     $links = array();
-    $rows[] = array($vocabulary->name, array("data" => $vocabulary->nodes, "align" => "center"), l(t("edit vocabulary"), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"), l(t("add term"), "admin/taxonomy/add/term/$vocabulary->vid"), l(t("preview form"), "admin/taxonomy/preview/vocabulary/$vocabulary->vid"));
+    $rows[] = array($vocabulary->name, array("data" => module_invoke($vocabulary->nodes, "node", "name"), "align" => "center"), l(t("edit vocabulary"), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"), l(t("add term"), "admin/taxonomy/add/term/$vocabulary->vid"), l(t("preview form"), "admin/taxonomy/preview/vocabulary/$vocabulary->vid"));
 
     $tree = taxonomy_get_tree($vocabulary->vid);
     if ($tree) {
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 567a8e5e3ff..ba6afc054c2 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -70,7 +70,7 @@ function taxonomy_link($type, $node = NULL) {
 function taxonomy_form_vocabulary($edit = array()) {
   foreach (module_list() as $name) {
     if (module_hook($name, "node")) {
-      $nodetypes[$name] = $name;
+      $nodetypes[$name] = module_invoke($name, "node", "name");
     }
   }
 
@@ -280,9 +280,10 @@ function taxonomy_overview() {
   $header = array(t("name"), t("node types"), array("data" => t("operations"), "colspan" => 3));
 
   $vocabularies = taxonomy_get_vocabularies();
+
   foreach ($vocabularies as $vocabulary) {
     $links = array();
-    $rows[] = array($vocabulary->name, array("data" => $vocabulary->nodes, "align" => "center"), l(t("edit vocabulary"), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"), l(t("add term"), "admin/taxonomy/add/term/$vocabulary->vid"), l(t("preview form"), "admin/taxonomy/preview/vocabulary/$vocabulary->vid"));
+    $rows[] = array($vocabulary->name, array("data" => module_invoke($vocabulary->nodes, "node", "name"), "align" => "center"), l(t("edit vocabulary"), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"), l(t("add term"), "admin/taxonomy/add/term/$vocabulary->vid"), l(t("preview form"), "admin/taxonomy/preview/vocabulary/$vocabulary->vid"));
 
     $tree = taxonomy_get_tree($vocabulary->vid);
     if ($tree) {