summaryrefslogtreecommitdiff
path: root/modules/taxonomy/taxonomy.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/taxonomy/taxonomy.module')
-rw-r--r--modules/taxonomy/taxonomy.module8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index c4e8c7fd1..69fe701ab 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -121,7 +121,7 @@ function taxonomy_menu($may_cache) {
* List and manage vocabularies.
*/
function taxonomy_overview_vocabularies() {
- $vocabularies = taxonomy_get_vocabularies();
+ $vocabularies = taxonomy_get_vocabularies();
foreach ($vocabularies as $vocabulary) {
$types = array();
foreach ($vocabulary->nodes as $type) {
@@ -133,7 +133,7 @@ function taxonomy_overview_vocabularies() {
$form[$vocabulary->vid]['edit'] = array('#value' => l(t('edit vocabulary'), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"));
$form[$vocabulary->vid]['list'] = array('#value' => l(t('list terms'), "admin/taxonomy/$vocabulary->vid"));
}
-
+
return drupal_get_form('taxonomy_overview_vocabularies', $form);
}
@@ -156,7 +156,7 @@ function theme_taxonomy_overview_vocabularies($form) {
$rows[] = array(array('data' => t('No categories available.'), 'colspan' => '4', 'class' => 'message'));
}
$header = array(t('Name'), t('Type'), array('data' => t('Operations'), 'colspan' => '2'));
-
+
$output = theme('table', $header, $rows, array('id' => 'taxonomy'));
$output .= form_render($form);
return $output;
@@ -509,7 +509,7 @@ function taxonomy_del_term($tid) {
}
}
- $term = taxonomy_get_term($tid);
+ $term = (array) taxonomy_get_term($tid);
db_query('DELETE FROM {term_data} WHERE tid = %d', $tid);
db_query('DELETE FROM {term_hierarchy} WHERE tid = %d', $tid);