summaryrefslogtreecommitdiff
path: root/modules/tracker
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-12-28 18:39:23 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-12-28 18:39:23 +0000
commitc719b1a5b332ea1051b612c5f8ffb99e789f4589 (patch)
tree4adfbb1b7879f7993a2036e0faef7b345433cbaf /modules/tracker
parent5a3d5149f4fb793b1bc177a3606e2ebcf938bba6 (diff)
downloadbrdo-c719b1a5b332ea1051b612c5f8ffb99e789f4589.tar.gz
brdo-c719b1a5b332ea1051b612c5f8ffb99e789f4589.tar.bz2
#950680 by ericduran, Dave Reid: Fixed Multiple notices from tracker after deleting a node
Diffstat (limited to 'modules/tracker')
-rw-r--r--modules/tracker/tracker.module7
-rw-r--r--modules/tracker/tracker.test7
2 files changed, 12 insertions, 2 deletions
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index a8f0ba5dd..ab5e19a73 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -181,7 +181,12 @@ function tracker_node_update($node, $arg = 0) {
* Implements hook_node_delete().
*/
function tracker_node_delete($node, $arg = 0) {
- _tracker_remove($node->nid, $node->uid, $node->changed);
+ db_delete('tracker_node')
+ ->condition('nid', $node->nid)
+ ->execute();
+ db_delete('tracker_user')
+ ->condition('nid', $node->nid)
+ ->execute();
}
/**
diff --git a/modules/tracker/tracker.test b/modules/tracker/tracker.test
index c0233085c..f3f742e8c 100644
--- a/modules/tracker/tracker.test
+++ b/modules/tracker/tracker.test
@@ -9,7 +9,7 @@ class TrackerTest extends DrupalWebTestCase {
public static function getInfo() {
return array(
'name' => 'Tracker',
- 'description' => 'Create nodes and check for their display in the tracker listings.',
+ 'description' => 'Create and delete nodes and check for their display in the tracker listings.',
'group' => 'Tracker'
);
}
@@ -44,6 +44,11 @@ class TrackerTest extends DrupalWebTestCase {
$this->assertNoText($unpublished->title, t('Unpublished node do not show up in the tracker listing.'));
$this->assertText($published->title, t('Published node show up in the tracker listing.'));
$this->assertLink(t('My recent content'), 0, t('User tab shows up on the global tracker page.'));
+
+ // Delete a node and ensure it no longer appears on the tracker.
+ node_delete($published->nid);
+ $this->drupalGet('tracker');
+ $this->assertNoText($published->title, t('Deleted node do not show up in the tracker listing.'));
}
/**