summaryrefslogtreecommitdiff
path: root/modules/node.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/node.module')
-rw-r--r--modules/node.module31
1 files changed, 15 insertions, 16 deletions
diff --git a/modules/node.module b/modules/node.module
index cc79aa2e3..ddb76a8ce 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1647,6 +1647,21 @@ function node_page() {
case 'feed':
node_feed();
return;
+ case 'view':
+ if (is_numeric(arg(1))) {
+ $node = node_load(arg(1), $_GET['revision']);
+ if ($node->nid) {
+ drupal_set_title(check_plain($node->title));
+ return node_show($node, arg(2));
+ }
+ else if (db_result(db_query('SELECT nid FROM {node} WHERE nid = %d', arg(1)))) {
+ drupal_access_denied();
+ }
+ else {
+ drupal_not_found();
+ }
+ }
+ break;
case 'add':
return node_add(arg(2));
break;
@@ -1679,21 +1694,6 @@ function node_page() {
}
}
break;
- case 'view':
- if (is_numeric(arg(1))) {
- $node = node_load(arg(1), $_GET['revision']);
- if ($node->nid) {
- drupal_set_title(check_plain($node->title));
- return node_show($node, arg(2));
- }
- else if (db_result(db_query('SELECT nid FROM {node} WHERE nid = %d', arg(1)))) {
- drupal_access_denied();
- }
- else {
- drupal_not_found();
- }
- }
- break;
case t('Preview'):
$edit = node_validate($edit);
drupal_set_title(t('Preview'));
@@ -1713,7 +1713,6 @@ function node_page() {
return node_preview($edit);
}
break;
-
case t('Delete'):
// Note: we redirect from node/uid/edit to node/uid/delete to make the tabs disappear.
if ($_REQUEST['destination']) {