diff options
| -rw-r--r-- | modules/node.module | 8 | ||||
| -rw-r--r-- | modules/node/node.module | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/modules/node.module b/modules/node.module index d3eba09ec..f9821bf3a 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1427,8 +1427,12 @@ function node_revision_delete($nid, $revision) { else { drupal_set_message(t('Deletion failed. You tried to delete the current revision.')); } - - drupal_goto("node/$nid/revisions"); + if (db_result(db_query('SELECT COUNT(vid) FROM {node_revisions} WHERE nid = %d', $nid)) > 1) { + drupal_goto("node/$nid/revisions"); + } + else { + drupal_goto("node/$nid"); + } } } diff --git a/modules/node/node.module b/modules/node/node.module index d3eba09ec..f9821bf3a 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1427,8 +1427,12 @@ function node_revision_delete($nid, $revision) { else { drupal_set_message(t('Deletion failed. You tried to delete the current revision.')); } - - drupal_goto("node/$nid/revisions"); + if (db_result(db_query('SELECT COUNT(vid) FROM {node_revisions} WHERE nid = %d', $nid)) > 1) { + drupal_goto("node/$nid/revisions"); + } + else { + drupal_goto("node/$nid"); + } } } |