diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-08-22 10:11:15 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-08-22 10:11:15 +0000 |
| commit | 3b8220e6f5c4b2bf3abfcaa98cde21acaa4a5511 (patch) | |
| tree | 18314720bd0bed359456538b85dabcc4e385b621 /modules | |
| parent | 75abab2451cc1bbcba58ecdbeb9f09f3f8aecf35 (diff) | |
| download | brdo-3b8220e6f5c4b2bf3abfcaa98cde21acaa4a5511.tar.gz brdo-3b8220e6f5c4b2bf3abfcaa98cde21acaa4a5511.tar.bz2 | |
- Patch #29335 by jonbob: shuffled the case-statements around for performance's sake.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node.module | 31 | ||||
| -rw-r--r-- | modules/node/node.module | 31 |
2 files changed, 30 insertions, 32 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']) { diff --git a/modules/node/node.module b/modules/node/node.module index cc79aa2e3..ddb76a8ce 100644 --- a/modules/node/node.module +++ b/modules/node/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']) { |