diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-11-22 13:33:00 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-11-22 13:33:00 +0000 |
| commit | 653e63bd05b3027797fff3d23377f448e47becfb (patch) | |
| tree | 20c8fcedcad77d14a6c51222a34f3beb1031b046 /includes | |
| parent | f8d3bf979817397c6b57bb7296e905b5e0d2be5e (diff) | |
| download | brdo-653e63bd05b3027797fff3d23377f448e47becfb.tar.gz brdo-653e63bd05b3027797fff3d23377f448e47becfb.tar.bz2 | |
- Patch #323474 by Dave Reid and catch: hook_boot() was not invoked on uncached page views if cache mode is aggressive.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 6 |
1 files changed, 3 insertions, 3 deletions
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. |