From eabcb2e3f319c840d3908b5a21b32f40fce40d2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 4 Oct 2012 13:43:48 +0000 Subject: [PATCH] Checked also for ext-cache, purged 'payments' cache file in FILTER_CACHE_DESTROY_ALL() --- inc/filter/cache_filter.php | 2 +- inc/functions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php index ec02333dfb..4ec2318e2e 100644 --- a/inc/filter/cache_filter.php +++ b/inc/filter/cache_filter.php @@ -89,7 +89,7 @@ function FILTER_CACHE_DESTROY_ALL ($filterData) { } // END - if // Remove cache files - foreach (array('admin', 'admin_acls', 'config', 'extension', 'earning', 'filter', 'imprint', 'modules', 'points_data', 'refdepths', 'refsystem', 'themes') as $cache) { + foreach (array('admin', 'admin_acls', 'config', 'extension', 'earning', 'filter', 'imprint', 'modules', 'payments', 'points_data', 'refdepths', 'refsystem', 'themes') as $cache) { // Is the cache file readable? // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. if ($GLOBALS['cache_instance']->loadCacheFile($cache)) { diff --git a/inc/functions.php b/inc/functions.php index 2afef01eab..106feb4dd2 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1402,7 +1402,7 @@ function rebuildCache ($cache, $inc = '', $force = false) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force))); // Shall I remove the cache file? - if (isCacheInstanceValid()) { + if ((isExtensionInstalled('cache')) && (isCacheInstanceValid())) { // Rebuild cache if ($GLOBALS['cache_instance']->loadCacheFile($cache)) { // Destroy it -- 2.39.2