#101486: Fix switch statement in index.php not to trigger on string numbers

1 files changed, 19 insertions, 17 deletions

diff --git a/index.php b/index.php
index e38404e61..e6cdc6d6f 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