=== modified file 'includes/menu.inc'
--- includes/menu.inc	2006-11-17 17:16:56 +0000
+++ includes/menu.inc	2006-12-05 16:35:27 +0000
@@ -385,7 +385,8 @@ function menu_set_location($location) {
  */
 function menu_execute_active_handler() {
   if (_menu_site_is_offline()) {
-    return MENU_SITE_OFFLINE;
+    drupal_site_offline();
+    return;
   }
 
   $menu = menu_get_menu();
@@ -396,16 +397,14 @@ function menu_execute_active_handler() {
     $path = substr($path, 0, strrpos($path, '/'));
   }
 
-  if (!isset($menu['callbacks'][$path])) {
-    return MENU_NOT_FOUND;
-  }
-
-  if (!function_exists($menu['callbacks'][$path]['callback'])) {
-    return MENU_NOT_FOUND;
+  if (!isset($menu['callbacks'][$path]) || !function_exists($menu['callbacks'][$path]['callback'])) {
+    drupal_not_found();
+    return;
   }
 
   if (!_menu_item_is_accessible(menu_get_active_item())) {
-    return MENU_ACCESS_DENIED;
+    drupal_access_denied();
+    return;
   }
 
   // We found one, and are allowed to execute it.

=== modified file 'index.php'
--- index.php	2006-01-27 18:51:51 +0000
+++ index.php	2006-12-05 16:32:46 +0000
@@ -13,22 +13,9 @@ 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;
+// Print any value (including an empty string) except NULL or undefined:
+if (isset($return)) {
+  print theme('page', $return);
 }
 
 drupal_page_footer();