Fixes/rewrites for 'dublicate entry' bug

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

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index f67cc108a525b1fc475d9b0d0d244fd09bbb45b2..299935f40d3cb06eb5819e5760c6bb17b6e81fb8 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -35,61 +35,60 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
+} elseif (!EXT_IS_ACTIVE("theme")) {
+       // Skip this loader
+       return false;
 }
 
-// Next cached table is the referral system (themes)...
-if (($cacheInstance->cache_file("themes", true) == true) && ($cacheInstance->ext_version_matches("theme"))) {
-       // Load referral system from cache
-       global $cacheArray;
-       $cache = $cacheInstance->cache_load();
+// Next cached table is the referal system (themes)...
+if (($GLOBALS['cache_instance']->loadCacheFile("themes")) && ($GLOBALS['cache_instance']->extensionVersionMatches("theme"))) {
+       // Load referal system from cache
+       $cache = $GLOBALS['cache_instance']->getArrayFromCache();
 
        // Restructure the array
-       $cacheArray['themes'] = array();
+       $GLOBALS['cache_array']['themes'] = array();
        foreach ($cache as $key => $data) {
                // Skip "theme_path" because we don't need to rebuild it
                if ($key == "theme_path") {
                        // Add entries with id
                        foreach ($data as $id => $entry) {
-                               $cacheArray['themes']['theme_path'][$cache['id'][$id]] = $entry;
+                               $GLOBALS['cache_array']['themes']['theme_path'][$cache['id'][$id]] = $entry;
                        } // END - foreach
                } else {
                        // Add all themes with theme name as array index
                        foreach ($data as $id => $entry) {
-                               $cacheArray['themes'][$key][$cache['theme_path'][$id]] = $entry;
+                               $GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry;
                        } // END - foreach
                }
        } // END - if
 
        // Remove dummy array
        unset($cache);
-} elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_themes') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("THEMES");
-       $cacheInstance->store_extension_version("theme");
+       $GLOBALS['cache_instance']->init("THEMES");
+       $GLOBALS['cache_instance']->storeExtensionVersion("theme");
 
        // Load all themes and their data
        if (GET_EXT_VERSION("theme") >= "0.0.7") {
-               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM "._MYSQL_PREFIX."_themes ORDER BY id", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
        } else {
-               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM "._MYSQL_PREFIX."_themes ORDER BY id", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
        }
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
-               $cacheInstance->add_row($data);
+               $GLOBALS['cache_instance']->addRow($data);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Close the cache
-       $cacheInstance->cache_close();
+       $GLOBALS['cache_instance']->finalize();
 
-       // Reload the cache
+       // Include loader again
        require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>