Removed invalid update of ext-user

[mailer.git] / inc / loader / load_cache-admin.php

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 073afe16c4e45241ef42f2ec955993f689307026..091d327a5f8d4554320f4fcd01d4da248474045a 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -90,10 +90,10 @@ if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_in
        $GLOBALS['cache_instance']->storeExtensionVersion("admins");
 
        // Load every data from DB to cache file
-       $ADD = runFilterChain('sql_admin_extra_data');
+       $add = runFilterChain('sql_admin_extra_data');
 
        // Query the database about this
-       $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
+       $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$add."
 FROM `{!_MYSQL_PREFIX!}_admins`
 ORDER BY login", __FILE__, __LINE__);
        while ($dummy = SQL_FETCHARRAY($result_admins)) {
@@ -122,8 +122,8 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
                $GLOBALS['cache_instance']->init("ADMINS_ACLS");
                $GLOBALS['cache_instance']->storeExtensionVersion("admins");
 
-               // Load all modules and their data
-               $result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
+               // 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, action_menu, what_menu", __FILE__, __LINE__);
 
                // Add all rows
                while ($data = SQL_FETCHARRAY($result)) {