summaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorSteven Wittens2006-12-12 09:32:18 (GMT)
committerSteven Wittens2006-12-12 09:32:18 (GMT)
commit9798d412bfd961ccb7e6d976b61baaf15973c63b (patch)
treea5b922fecea3a494817ca433fe2c41834ab470cc /index.php
parent4a95d629589c13aa4b8f47abe295de344d3b8d42 (diff)
#101486: Fix switch statement in index.php not to trigger on string numbers
Diffstat (limited to 'index.php')
-rw-r--r--index.php36
1 files changed, 19 insertions, 17 deletions
diff --git a/index.php b/index.php
index e38404e..e6cdc6d 100644
--- a/index.php
+++ b/index.php
@@ -13,23 +13,25 @@ require_once './includes/bootstrap.inc';
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
$return = menu_execute_active_handler();
-switch ($return) {
- case MENU_NOT_FOUND:
- drupal_not_found();
- break;
- case MENU_ACCESS_DENIED:
- drupal_access_denied();
- break;
- case MENU_SITE_OFFLINE:
- drupal_site_offline();
- break;
- default:
- // Print any value (including an empty string) except NULL or undefined:
- if (isset($return)) {
- print theme('page', $return);
- }
- break;
+
+// Menu status constants are integers; page content is a string.
+if (is_int($return)) {
+ switch ($return) {
+ case MENU_NOT_FOUND:
+ drupal_not_found();
+ break;
+ case MENU_ACCESS_DENIED:
+ drupal_access_denied();
+ break;
+ case MENU_SITE_OFFLINE:
+ drupal_site_offline();
+ break;
+ }
}
+elseif (isset($return)) {
+ // Print any value (including an empty string) except NULL or undefined:
+ print theme('page', $return);
-drupal_page_footer();
+}
+drupal_page_footer(); \ No newline at end of file