Fixes + asserts

[mailer.git] / inc / filter / cache_filter.php

diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php
index 02b456d55579c7c8accaed9944cea885cf88ec77..f514142b2d9bebbb00dd5abc5e78444bc58ddfd8 100644 (file)
--- a/inc/filter/cache_filter.php
+++ b/inc/filter/cache_filter.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($filterData) {
        // Return the data anyway if there is no cache extension
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($filterData) {
        // Return the data anyway if there is no cache extension
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');

-       if (!isCacheInstanceValid()) {
+       if (!isValidCacheInstance()) {

                return FALSE;
        } // END - if
 
                return FALSE;
        } // END - if
 


@@ -63,7 +63,7 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($filterData) {
 function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');

-       if (!isCacheInstanceValid()) {
+       if (!isValidCacheInstance()) {

                return FALSE;
        } // END - if
 
                return FALSE;
        } // END - if
 


@@ -79,7 +79,7 @@ function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($filterData) {
 function FILTER_CACHE_DESTROY_ALL ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 function FILTER_CACHE_DESTROY_ALL ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');

-       if (!isCacheInstanceValid()) {
+       if (!isValidCacheInstance()) {

                return FALSE;
        } // END - if
 
                return FALSE;
        } // END - if
 


@@ -97,7 +97,7 @@ function FILTER_CACHE_DESTROY_ALL ($filterData) {
 function FILTER_CACHE_DESTROY_FILTER ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 function FILTER_CACHE_DESTROY_FILTER ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');

-       if ((!isCacheInstanceValid()) || ((isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') != 'Y'))) {
+       if ((!isValidCacheInstance()) || ((isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') != 'Y'))) {

                return FALSE;
        } // END - if
 
                return FALSE;
        } // END - if