From a0454264af5fdd5cc669445fa697ddfbcc84fd83 Mon Sep 17 00:00:00 2001 From: Steven Wittens Date: Wed, 8 Feb 2006 00:47:14 +0000 Subject: [PATCH] - Node revisions 404/403 handling called drupal_not_found() twice. --- modules/node.module | 15 ++++----------- modules/node/node.module | 15 ++++----------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/modules/node.module b/modules/node.module index 0706abc1fd2..8c979f1e0b8 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1942,10 +1942,8 @@ function node_revisions() { if ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node)) { return node_revision_overview($node); } - else { - drupal_access_denied(); - } - break; + drupal_access_denied(); + return; case 'view': if (is_numeric(arg(3))) { $node = node_load(arg(1), arg(3)); @@ -1954,12 +1952,10 @@ function node_revisions() { drupal_set_title(t('Revision of %title from %date', array('%title' => theme('placeholder', $node->title), '%date' => format_date($node->revision_timestamp)))); return node_show($node, arg(2)); } - else { - drupal_access_denied(); - } + drupal_access_denied(); + return; } } - drupal_not_found(); break; case 'revert': node_revision_revert(arg(1), arg(3)); @@ -1967,9 +1963,6 @@ function node_revisions() { case 'delete': node_revision_delete(arg(1), arg(3)); break; - default: - drupal_not_found(); - break; } } drupal_not_found(); diff --git a/modules/node/node.module b/modules/node/node.module index 0706abc1fd2..8c979f1e0b8 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1942,10 +1942,8 @@ function node_revisions() { if ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node)) { return node_revision_overview($node); } - else { - drupal_access_denied(); - } - break; + drupal_access_denied(); + return; case 'view': if (is_numeric(arg(3))) { $node = node_load(arg(1), arg(3)); @@ -1954,12 +1952,10 @@ function node_revisions() { drupal_set_title(t('Revision of %title from %date', array('%title' => theme('placeholder', $node->title), '%date' => format_date($node->revision_timestamp)))); return node_show($node, arg(2)); } - else { - drupal_access_denied(); - } + drupal_access_denied(); + return; } } - drupal_not_found(); break; case 'revert': node_revision_revert(arg(1), arg(3)); @@ -1967,9 +1963,6 @@ function node_revisions() { case 'delete': node_revision_delete(arg(1), arg(3)); break; - default: - drupal_not_found(); - break; } } drupal_not_found();