--- includes/bootstrap.inc.1.238 Sat Oct 18 23:59:53 2008 +++ includes/bootstrap.inc Mon Oct 20 01:19:05 2008 @@ -1098,13 +1098,12 @@ function _drupal_bootstrap($phase) { case DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE: // Initialize configuration variables, using values from settings.php if available. $conf = variable_init(isset($conf) ? $conf : array()); - // Load module handling. - require_once DRUPAL_ROOT . '/includes/module.inc'; + // Try to get the page from the cache. $cache_mode = variable_get('cache', CACHE_DISABLED); - // Get the page from the cache. $cache = $cache_mode == CACHE_DISABLED ? '' : page_get_cache(); // If the skipping of the bootstrap hooks is not enforced, call hook_boot. - if ($cache_mode != CACHE_AGGRESSIVE) { + if (!$cache || ($cache_mode != CACHE_AGGRESSIVE)) { + require_once DRUPAL_ROOT . '/includes/module.inc'; bootstrap_invoke_all('boot'); } // If there is a cached page, display it.