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

[mailer.git] / inc / extensions.php

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;
                }