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

- Patch #42153 by Junyor: slight clean-up of node_revision_delete().

4.7.x
Dries Buytaert 2005-12-24 13:05:22 +00:00
parent b43fa0f9da
commit ba12462fc9
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/node.module
View File

@ -1344,21 +1344,19 @@ function node_revision_rollback($nid, $revision) {
* Delete the revision with specified revision number. * Delete the revision with specified revision number.
*/ */
function node_revision_delete($nid, $revision) { function node_revision_delete($nid, $revision) {
if (user_access('administer nodes')) { if (user_access('administer nodes')) {
$node = node_load($nid); $node = node_load($nid);
if (node_access('delete', $node)) { if (node_access('delete', $node)) {
$current_revision = db_result(db_query('SELECT vid FROM {node} WHERE nid = %d', $nid));
// Don't delete the current revision // Don't delete the current revision
if ($revision != $current_revision) { if ($revision != $node->vid) {
$node = node_load($nid, $revision); $node = node_load($nid, $revision);
db_query("DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision); db_query("DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision);
node_invoke_nodeapi($node, 'delete revision'); node_invoke_nodeapi($node, 'delete revision');
drupal_set_message(t('Deleted %title revision %revision.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision)))); drupal_set_message(t('Deleted %title revision %revision.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
watchdog('content', t('%type: deleted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision)))); watchdog('content', t('%type: deleted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
} }
else { else {
drupal_set_message(t('Deletion failed. You tried to delete the current revision.')); drupal_set_message(t('Deletion failed. You tried to delete the current revision.'));
} }
@ -1366,6 +1364,7 @@ function node_revision_delete($nid, $revision) {
drupal_goto("node/$nid/revisions"); drupal_goto("node/$nid/revisions");
} }
} }
drupal_access_denied(); drupal_access_denied();
} }

7
modules/node/node.module
View File

@ -1344,21 +1344,19 @@ function node_revision_rollback($nid, $revision) {
* Delete the revision with specified revision number. * Delete the revision with specified revision number.
*/ */
function node_revision_delete($nid, $revision) { function node_revision_delete($nid, $revision) {
if (user_access('administer nodes')) { if (user_access('administer nodes')) {
$node = node_load($nid); $node = node_load($nid);
if (node_access('delete', $node)) { if (node_access('delete', $node)) {
$current_revision = db_result(db_query('SELECT vid FROM {node} WHERE nid = %d', $nid));
// Don't delete the current revision // Don't delete the current revision
if ($revision != $current_revision) { if ($revision != $node->vid) {
$node = node_load($nid, $revision); $node = node_load($nid, $revision);
db_query("DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision); db_query("DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision);
node_invoke_nodeapi($node, 'delete revision'); node_invoke_nodeapi($node, 'delete revision');
drupal_set_message(t('Deleted %title revision %revision.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision)))); drupal_set_message(t('Deleted %title revision %revision.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
watchdog('content', t('%type: deleted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision)))); watchdog('content', t('%type: deleted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
} }
else { else {
drupal_set_message(t('Deletion failed. You tried to delete the current revision.')); drupal_set_message(t('Deletion failed. You tried to delete the current revision.'));
} }
@ -1366,6 +1364,7 @@ function node_revision_delete($nid, $revision) {
drupal_goto("node/$nid/revisions"); drupal_goto("node/$nid/revisions");
} }
} }
drupal_access_denied(); drupal_access_denied();
} }