Checked also for ext-cache, purged 'payments' cache file in FILTER_CACHE_DESTROY_ALL()

diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php
index ec02333dfb0abeb63024bab156179b4e0ae618a0..4ec2318e2ecee51e9fa18d2589bc9933d2c2e757 100644 (file)
--- 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 2afef01eabf53df9410f4f2497abf5c523f16a08..106feb4dd2bad1bba207aa21ad4449f1ee95f881 100644 (file)
--- 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