summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-07-20 22:18:53 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-07-20 22:18:53 +0000
commitf15bb0110da9dc32148bbf1010542784b22e6f1a (patch)
treee7e5049bfaa0ceaad462f6a33c06e790b9ab77e6 /modules/node
parent1a4a3ec577c976e22fd2e93a7339afe6eddf24db (diff)
downloadbrdo-f15bb0110da9dc32148bbf1010542784b22e6f1a.tar.gz
brdo-f15bb0110da9dc32148bbf1010542784b22e6f1a.tar.bz2
#457744 by quicksketch: Insert missing calls to file_attach_delete() and file_attach_delete_revision().
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.module1
-rw-r--r--modules/node/node.pages.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index acbdbc0ac..0453b3226 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1067,6 +1067,7 @@ function node_delete_multiple($nids) {
// Call the node-specific callback (if any):
node_invoke($node, 'delete');
module_invoke_all('node_delete', $node);
+ field_attach_delete('node', $node);
// Remove this node from the search index if needed.
// This code is implemented in node module rather than in search module,
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 185160e08..6990d6c19 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -551,6 +551,7 @@ function node_revision_delete_confirm_submit($form, &$form_state) {
->condition('vid', $node_revision->vid)
->execute();
module_invoke_all('node_delete_revision', $node_revision);
+ field_attach_delete_revision('node', $node_revision);
watchdog('content', '@type: deleted %title revision %revision.', array('@type' => $node_revision->type, '%title' => $node_revision->title, '%revision' => $node_revision->vid));
drupal_set_message(t('Revision from %revision-date of @type %title has been deleted.', array('%revision-date' => format_date($node_revision->revision_timestamp), '@type' => node_type_get_name($node_revision), '%title' => $node_revision->title)));
$form_state['redirect'] = 'node/' . $node_revision->nid;