diff options
author | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-04-06 04:21:12 +0000 |
---|---|---|
committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-04-06 04:21:12 +0000 |
commit | be0b774cbcae15a664eff0f308b436aabd6f3dd0 (patch) | |
tree | a73a8ba649c4eb4d9db6ffe2b6566c2d9dbdcbc7 /modules/forum.module | |
parent | ec04325bb29f431f05d59a7cb8e4429b86267b65 (diff) | |
download | brdo-be0b774cbcae15a664eff0f308b436aabd6f3dd0.tar.gz brdo-be0b774cbcae15a664eff0f308b436aabd6f3dd0.tar.bz2 |
- #57523: Make taxonomy delete vocabulary consistent with other taxonomy hook ops
Diffstat (limited to 'modules/forum.module')
-rw-r--r-- | modules/forum.module | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/forum.module b/modules/forum.module index cc607d18c..d3f6ea154 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -149,10 +149,10 @@ function forum_nodeapi(&$node, $op, $teaser, $page) { * Implementation of hook_taxonomy(). */ function forum_taxonomy($op, $type, $term = NULL) { - if ($op == 'delete' && $term->vid == _forum_get_vid()) { + if ($op == 'delete' && $term['vid'] == _forum_get_vid()) { switch ($type) { case 'term': - $results = db_query('SELECT f.nid FROM {forum} f WHERE f.tid = %d', $term->tid); + $results = db_query('SELECT f.nid FROM {forum} f WHERE f.tid = %d', $term['tid']); while ($node = db_fetch_object($results)) { // node_delete will also remove any association with non-forum vocabularies. node_delete($node->nid); @@ -160,7 +160,7 @@ function forum_taxonomy($op, $type, $term = NULL) { // For containers, remove the tid from the forum_containers variable. $containers = variable_get('forum_containers', array()); - if ($key = array_search($term->tid, $containers)) { + if ($key = array_search($term['tid'], $containers)) { unset($containers[$key]); } variable_set('forum_containers', $containers); |