Cache file does no longer output fatal messages when it can't find file for deletion

[mailer.git] / inc / libs / cache_functions.php

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 15adc4680619d683518bb041cddce11807b4e788..671853299bc8388f083e649fddd4bc08be2b7fea 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -230,10 +230,7 @@ class CacheSystem {
                                // Not removed!
                                ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);
                        }
-               } else {
-                       // Does not exist!
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
-               }
+               } // END - if
        }
 
        // Unused method:
@@ -397,22 +394,25 @@ class CacheSystem {
 }
 
 // Destroy the cache on extension changes
-function FILTER_CACHE_DESTROY_ON_EXT_CHANGE () {
+function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
        global $cacheInstance;
 
-       // Update cache
+       // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
                if ($cacheInstance->loadCacheFile("config"))     $cacheInstance->destroyCacheFile();
                if ($cacheInstance->loadCacheFile("extensions")) $cacheInstance->destroyCacheFile();
                if ($cacheInstance->loadCacheFile("mod_reg"))    $cacheInstance->destroyCacheFile();
        } // END - if
+
+       // Return it
+       return $data;
 }
 
 // Destroy the cache on changing admin
 function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE () {
        global $cacheInstance;
 
-       // Update cache
+       // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
                if ($cacheInstance->loadCacheFile("admins")) $cacheInstance->destroyCacheFile();
        } // END - if
@@ -424,15 +424,22 @@ function FILTER_CACHE_DESTROY_ALL () {
 
        // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
-               if ($cacheInstance->loadCacheFile("admins"))     $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("config"))     $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("extensions")) $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("mod_reg"))    $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("refdepths"))  $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("refsystem"))  $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("themes"))     $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("admins"))      $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("config"))      $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("extensions"))  $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("mod_reg"))     $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("refdepths"))   $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("refsystem"))   $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("themes"))      $cacheInstance->destroyCacheFile();
        } // END - if
 }
 
+// Filter for purging entire admin menu cache
+function FILTER_CACHE_PURGE_ADMIN_MENU () {
+       // Just call the function
+       CACHE_PURGE_ADMIN_MENU();
+}
+
 //
 ?>