Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#890790 by moshe weitzman: Fixed deleting nodes does not delete their comments.

merge-requests/26/head
Angie Byron 2010-08-23 22:15:34 +00:00
parent 7fcde37aca
commit dd57256903
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/node/node.module
View File

@ -1138,16 +1138,6 @@ function node_delete_multiple($nids) {
if (!empty($nids)) { if (!empty($nids)) {
$nodes = node_load_multiple($nids, array()); $nodes = node_load_multiple($nids, array());
db_delete('node')
->condition('nid', $nids, 'IN')
->execute();
db_delete('node_revision')
->condition('nid', $nids, 'IN')
->execute();
db_delete('history')
->condition('nid', $nids, 'IN')
->execute();
foreach ($nodes as $nid => $node) { foreach ($nodes as $nid => $node) {
// Call the node-specific callback (if any): // Call the node-specific callback (if any):
node_invoke($node, 'delete'); node_invoke($node, 'delete');
@ -1163,6 +1153,17 @@ function node_delete_multiple($nids) {
} }
} }
// Delete after calling hooks so that they can query node tables as needed.
db_delete('node')
->condition('nid', $nids, 'IN')
->execute();
db_delete('node_revision')
->condition('nid', $nids, 'IN')
->execute();
db_delete('history')
->condition('nid', $nids, 'IN')
->execute();
// Clear the page and block and node_load_multiple caches. // Clear the page and block and node_load_multiple caches.
cache_clear_all(); cache_clear_all();
entity_get_controller('node')->resetCache(); entity_get_controller('node')->resetCache();