diff options
| -rw-r--r-- | modules/taxonomy.module | 5 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 567a8e5e3..ba6afc054 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 567a8e5e3..ba6afc054 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) { |