Cache depency was to strict

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 39da8f2203a27fa9d7c66a114fdc03f01bb1ecad..8bb5e31797c7a3678f12e729cec427edfdcea8a2 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -51,7 +51,7 @@ function ADD_MODULE_TITLE($mod) {
 
                        // Update cache hits
                        if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
-               } else {
+               } elseif (!EXT_IS_ACTIVE("cache")) {
                        // Load from database
                        $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);
                        list($name) = SQL_FETCHROW($result);
@@ -121,7 +121,7 @@ function CHECK_MODULE ($mod) {
                        // No, then we have to update it!
                        $ret = "cache_miss";
                }
-       } else {
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                // Check for module in database
                $result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1", array($mod_chk), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
@@ -466,10 +466,10 @@ function IS_ADMIN($admin="")
 
                // Cache it away
                $cacheArray['admin_hash'] = $valPass;
-       } elseif (!empty($admin)) {
+       } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['admins']['password'][$admin]))) {
                // Search for admin
                $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-                array($admin), __FILE__, __LINE__);
+                       array($admin), __FILE__, __LINE__);
 
                // Is he admin?
                $passDB = "";
@@ -1131,7 +1131,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
                        // Count cache hit
                        if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
                }
-       } else {
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                // Get referal data
                $result_lvl = SQL_QUERY_ESC("SELECT percents FROM "._MYSQL_PREFIX."_refdepths WHERE level='%s' LIMIT 1",
                        array(bigintval($level)), __FILE__, __LINE__);
@@ -1748,7 +1748,7 @@ function LOAD_CONFIG ($no="0") {
                if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
                        $CFG_DUMMY['cache_hits']++;
                } // END - if
-       } else {
+       } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($cacheArray['config'][$no]))) {
                // Load config from DB
                $result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config=%d LIMIT 1",
                        array(bigintval($no)), __FILE__, __LINE__);