Cache was destroyed in load_cache.php -> fixed, invalid cache test removed

diff --git a/inc/extensions.php b/inc/extensions.php
index 6232456238c12dd25fda975e9615064d0daa98b3..abad4d77ae24e30a68f3b0ad22cfe66616d0ced0 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -295,25 +295,23 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
        // Extension's file name will also be checked
        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
        if ((!file_exists($file)) && (!is_readable($file))) return false;
        // Extension's file name will also be checked
        $file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
        if ((!file_exists($file)) && (!is_readable($file))) return false;

-       //* DEBUG: */ echo "*".$ext_name."*<br />";
+       //* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")<br />";

 
        // Failed is the default
        $ret = false;
 
        // Failed is the default
        $ret = false;

-       if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache))
-       {
+       if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) {

                // Load from cache
                // Load from cache

+               //* DEBUG: */ echo "CACHE!<br />\n";

                $active = $cacheArray['extensions']['ext_active'][$ext_name];
 
                // Count cache hits
                if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++;
                $active = $cacheArray['extensions']['ext_active'][$ext_name];
 
                // Count cache hits
                if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++;

-       }
-        else
-       {
+       } else {
+               //* DEBUG: */ echo "DB!<br />\n";

                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_active FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
                 array($ext_name), __FILE__, __LINE__);
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_active FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
                 array($ext_name), __FILE__, __LINE__);

-               if (SQL_NUMROWS($result) == 0)
-               {
+               if (SQL_NUMROWS($result) == 0) {

                        // Extension was not found!
                        return false;
                }
                        // Extension was not found!
                        return false;
                }

diff --git a/inc/load_cache.php b/inc/load_cache.php
index dea40b937a0b6f28434d9a1d9df1ee443c7d8a92..2804679016b15f967fa4360806644d07318be2cc 100644 (file)
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -195,11 +195,11 @@ $cacheInstance->cache_close();
 if ($cacheInstance->cache_file("config", true) == true) {
        // Load config from cache
        global $cacheArray;
 if ($cacheInstance->cache_file("config", true) == true) {
        // Load config from cache
        global $cacheArray;

-       $cacheArray = $cacheInstance->cache_load();
+       $cacheArrayConfig = $cacheInstance->cache_load();

 
        // Valid cache file
        $CNT = 0; $newCache = array();
 
        // Valid cache file
        $CNT = 0; $newCache = array();

-       foreach ($cacheArray as $key=>$array) {
+       foreach ($cacheArrayConfig as $key=>$array) {

                foreach ($array as $key2=>$value) {
                        $newCache[$key2][$key] = $value;
                }
                foreach ($array as $key2=>$value) {
                        $newCache[$key2][$key] = $value;
                }


@@ -208,16 +208,6 @@ if ($cacheInstance->cache_file("config", true) == true) {
 
        // Overwrite the config with the cache version
        $cacheArray['config'] = $newCache;
 
        // Overwrite the config with the cache version
        $cacheArray['config'] = $newCache;

-
-       // When there is a period (.) in the result this test will fail and so the cache file is
-       // damaged/corrupted
-       $TEST = "failed";
-       if (count($cacheArray) > 0 ) $TEST = ($CNT / (count($cacheArray)));
-       if ($TEST != bigintval($TEST)) {
-               // Cache file is corrupted!
-               $cacheInstance->cache_destroy();
-               unset($cacheArray);
-       }

 } elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("CONFIG");
 } elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("CONFIG");