From dcce64b16fffe71abd988d1921bfc9e05f9040a8 Mon Sep 17 00:00:00 2001 From: Lorenz Schori Date: Sat, 19 Jan 2013 13:52:33 +0100 Subject: [PATCH 3/3] Use _cache_get_object instead of variable_get to determine cache class in use for cache_page bin --- authcache.helpers.inc | 2 +- authcache.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/authcache.helpers.inc b/authcache.helpers.inc index 4fa90fe..7e205d7 100644 --- a/authcache.helpers.inc +++ b/authcache.helpers.inc @@ -249,7 +249,7 @@ function _authcache_shutdown_save_page() { 'page_queries' => '-1', // Database benchmark, if enabled 'cache_render' => '-1', // Filled by cookie via JS on cache request 'cache_uid' => $user->uid, // Required by JS for HTML updates - 'cache_class' => variable_get('cache_class_cache_page', 'unknown'), + 'cache_class' => get_class(_cache_get_object('cache_page')), 'cache_time' => REQUEST_TIME, // Required by JS for HTML updates, 'is_cacheable' => $_authcache_is_cacheable, 'cache_key' => $key, diff --git a/authcache.inc b/authcache.inc index 01e0d1e..4182e6e 100644 --- a/authcache.inc +++ b/authcache.inc @@ -64,7 +64,7 @@ function authcache_retrieve_cache_page(){ // Connect to database if default database cache hander is // selected - if (variable_get('cache_class_cache_page', 'DrupalDatabaseCache') == 'DrupalDatabaseCache') { + if (get_class(_cache_get_object('cache_page')) == 'DrupalDatabaseCache') { drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE, FALSE); } -- 1.7.10.4