--- sites/all/modules/subscriptions/subscriptions_content.module 2009-07-22 11:51:10.000000000 -0400 +++ sites/all/modules/subscriptions/subscriptions_content.module.new 2009-07-26 16:31:03.000000000 -0400 @@ -230,7 +230,9 @@ function subscriptions_content_nodeapi(& break; case 'delete': - db_query("DELETE FROM {subscriptions} WHERE module = 'node' AND field = 'nid' AND value = '%s'", $node->nid); + $condition = array('module' => 'node', 'field' => 'nid', 'value' => $node->nid); + subscriptions_delete_subscription($condition); + break; } } @@ -1097,7 +1099,7 @@ function subscriptions_content_node_type } $type = $info->type; db_query("DELETE FROM {subscriptions_queue} WHERE module = 'node' AND field = 'type' AND value = '%s'", $type); - db_query("DELETE FROM {subscriptions} WHERE module = 'node' AND field = 'type' AND value = '%s'", $type); + subscriptions_delete_subscription(array('module' => 'node', 'field' => 'type', 'value' => $type)); foreach (array('blocked', 'unlisted') as $key) { $array = variable_get('subscriptions_'. $key .'_content_types', array()); unset($array[$type]);