diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-12-05 19:27:34 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-12-05 19:27:34 +0000 |
| commit | 5b6acba1d2d9d3039fca231ccfc82585fce66590 (patch) | |
| tree | 88d78717f716273e2f2334637bbef4c12771e3c5 | |
| parent | 3774362838a45a0a1f4f39c18e5cbd04a632959e (diff) | |
| download | brdo-5b6acba1d2d9d3039fca231ccfc82585fce66590.tar.gz brdo-5b6acba1d2d9d3039fca231ccfc82585fce66590.tar.bz2 | |
- Patch #652042 by chx: cache.inc is always needed.
| -rw-r--r-- | includes/bootstrap.inc | 5 | ||||
| -rw-r--r-- | install.php | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 012d89d1d..f917eda9f 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1566,7 +1566,10 @@ function _drupal_bootstrap_page_cache() { // Allow specifying special cache handlers in settings.php, like // using memcached or files for storing cache information. - require_once DRUPAL_ROOT . '/' . variable_get('cache_inc', 'includes/cache.inc'); + require_once DRUPAL_ROOT . '/includes/cache.inc'; + foreach (variable_get('cache_backends', array()) as $include) { + require_once DRUPAL_ROOT . '/' . $include; + } // Check for a cache mode force from settings.php. if (variable_get('page_cache_without_database')) { $cache_mode = CACHE_NORMAL; diff --git a/install.php b/install.php index d440ad46a..4ee60902d 100644 --- a/install.php +++ b/install.php @@ -267,7 +267,6 @@ function install_begin_request(&$install_state) { // suspect, due to the fact that Drupal is not fully set up yet. require_once DRUPAL_ROOT . '/includes/cache.inc'; require_once DRUPAL_ROOT . '/includes/cache-install.inc'; - $conf['cache_inc'] = 'includes/cache.inc'; $conf['cache_default_class'] = 'DrupalFakeCache'; // Prepare for themed output, if necessary. We need to run this at the |