summaryrefslogtreecommitdiff
path: root/modules/taxonomy
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-03-23 21:46:35 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-03-23 21:46:35 +0000
commitd11c07502de0861fcc06d908fd7811ceccedeec4 (patch)
tree97300de2841fb850184089320c3f7567ece5c18f /modules/taxonomy
parent667298972f2d0aea58239593010e73c15afd9d65 (diff)
downloadbrdo-d11c07502de0861fcc06d908fd7811ceccedeec4.tar.gz
brdo-d11c07502de0861fcc06d908fd7811ceccedeec4.tar.bz2
#54910, Forum and taxonomy term delete work only superficially, patch by Zen
Diffstat (limited to 'modules/taxonomy')
-rw-r--r--modules/taxonomy/taxonomy.module5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index eee09173a..457875fa8 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -485,7 +485,7 @@ function taxonomy_del_term($tid) {
}
}
- $term = (array) taxonomy_get_term($tid);
+ $term = taxonomy_get_term($tid);
db_query('DELETE FROM {term_data} WHERE tid = %d', $tid);
db_query('DELETE FROM {term_hierarchy} WHERE tid = %d', $tid);
@@ -494,13 +494,14 @@ function taxonomy_del_term($tid) {
db_query('DELETE FROM {term_node} WHERE tid = %d', $tid);
module_invoke_all('taxonomy', 'delete', 'term', $term);
- return SAVED_DELETED;
}
$tids = $orphans;
}
cache_clear_all();
+
+ return SAVED_DELETED;
}
function _taxonomy_confirm_del_term($tid) {