From 9fe3f47d516aeee72d4e64749ac4264b458fd178 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 31 Aug 2008 09:34:46 +0000 Subject: [PATCH] Cache was destroyed in load_cache.php -> fixed, invalid cache test removed --- inc/extensions.php | 14 ++++++-------- inc/load_cache.php | 14 ++------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/inc/extensions.php b/inc/extensions.php index 6232456238..abad4d77ae 100644 --- 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; - //* DEBUG: */ echo "*".$ext_name."*
"; + //* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")
"; // 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 + //* DEBUG: */ echo "CACHE!
\n"; $active = $cacheArray['extensions']['ext_active'][$ext_name]; // Count cache hits if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++; - } - else - { + } else { + //* DEBUG: */ echo "DB!
\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__); - if (SQL_NUMROWS($result) == 0) - { + if (SQL_NUMROWS($result) == 0) { // Extension was not found! return false; } diff --git a/inc/load_cache.php b/inc/load_cache.php index dea40b937a..2804679016 100644 --- 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; - $cacheArray = $cacheInstance->cache_load(); + $cacheArrayConfig = $cacheInstance->cache_load(); // 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; } @@ -208,16 +208,6 @@ if ($cacheInstance->cache_file("config", true) == true) { // 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"); -- 2.30.2