Fixes/rewrites for 'dublicate entry' bug

[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 2ae06ced10913d45550f2119a2ad14309fb752cf..7ffffb8c6e1f690152b613e7831658889161612c 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -85,7 +85,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_in
        $GLOBALS['cache_instance']->storeExtensionVersion("admins");
 
        // Load every data from DB to cache file
-       $ADD = RUN_FILTER('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."
@@ -102,8 +102,8 @@ ORDER BY login", __FILE__, __LINE__);
        // Close cache
        $GLOBALS['cache_instance']->finalize();
 
-       // Reload the cache
-       LOAD_INC(__FILE__);
+       // Include loader again
+       require(__FILE__);
 }
 
 // Next cached table are the admins_acls...
@@ -111,7 +111,6 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
        // Check for cache file
        if (($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) {
                // Load referal system from cache
-               global $GLOBALS['cache_array'];
                $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
        } elseif ((getConfig('cache_acls') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
                // Create cache file here
@@ -133,8 +132,8 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
                // Close cache
                $GLOBALS['cache_instance']->finalize();
 
-               // Reload the cache
-               LOAD_INC(__FILE__);
+               // Include loader again
+               require(__FILE__);
        }
 } // END - if