From 64ce3848d3bd16233fc14a6b2fe973f476ed78d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Tue, 6 Jan 2009 17:14:04 +0000
Subject: [PATCH] #323474 by gpk, Dave Reid, catch: hook_boot() was not called
on non-cached pages when agreesive caching was on
---
includes/bootstrap.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 760fe54a68de..371f6a99f574 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1012,13 +1012,13 @@ 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 './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 './includes/module.inc';
bootstrap_invoke_all('boot');
}
// If there is a cached page, display it.
--
GitLab