Queries fixed

[mailer.git] / inc / loader / load-admins.php

diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php
index f769d6b98cfa4cd42a03e121d53393d36cb9d2d1..190347f9a3e42c1732ff1034b32b986836d9af1f 100644 (file)
--- a/inc/loader/load-admins.php
+++ b/inc/loader/load-admins.php
@@ -140,17 +140,20 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
                                $GLOBALS['cache_instance']->removeCacheFile();
                                unset($GLOBALS['cache_array']['admin_acls']);
                        }
-               } else {
+               } elseif (count($GLOBALS['cache_array']['admin_acls']) > 0) {
                        // Nope, cache file is corrupted!
                        $GLOBALS['cache_instance']->removeCacheFile();
                        unset($GLOBALS['cache_array']['admin_acls']);
+               } elseif (isDebugModeEnabled()) {
+                       // This may drive a lot messages to the logfile
+                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'No entry found in admin_acls to rewrite.');
                }
        } elseif (isHtmlOutputMode()) {
                // Create cache file here
                $GLOBALS['cache_instance']->init();
 
-               // Load all modules and their data (column 'id' is no longer required)
-               $result = SQL_QUERY('SELECT `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `action_menu` ASC, `what_menu` ASC', __FILE__, __LINE__);
+               // Load all admins and their data
+               $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `action_menu` ASC, `what_menu` ASC', __FILE__, __LINE__);
 
                // Add all rows
                while ($content = SQL_FETCHARRAY($result)) {