From 653e63bd05b3027797fff3d23377f448e47becfb Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 22 Nov 2008 13:33:00 +0000 Subject: - Patch #323474 by Dave Reid and catch: hook_boot() was not invoked on uncached page views if cache mode is aggressive. --- includes/bootstrap.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes') diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 6cb1e02f0..9e4e78ea0 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1140,13 +1140,13 @@ function _drupal_bootstrap($phase) { break; case DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE: - // Load module handling. - require_once DRUPAL_ROOT . '/includes/module.inc'; $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) { + // Load module handling. + require_once DRUPAL_ROOT . '/includes/module.inc'; bootstrap_invoke_all('boot'); } // If there is a cached page, display it. -- cgit v1.2.3