Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

#323474 by gpk, Dave Reid, catch: hook_boot() was not called on non-c…

…ached pages when agreesive caching was on
  • Loading branch information...
commit 8b9e143311b580dff92400f862cc323984687975 1 parent f0e9d34
goba authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 includes/bootstrap.inc
View
8 includes/bootstrap.inc
@@ -1,5 +1,5 @@
<?php
-// $Id: bootstrap.inc,v 1.206.2.7 2008-12-08 11:49:48 goba Exp $
+// $Id: bootstrap.inc,v 1.206.2.8 2009-01-06 17:14:04 goba Exp $
/**
* @file
@@ -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.
Please sign in to comment.
Something went wrong with that request. Please try again.