RevBomb patch applied (thanks to profi-concept)

[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 fd3b2a39825b291d9c82fa9191d5f461d8ffc8c3..797e4901937e2417e495b3103d0d795433a131be 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -41,53 +46,52 @@ if (!defined('__SECURITY')) {
 }
 
 // Next cached table is the referal system (themes)...
-if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersionMatches("theme"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("themes")) && ($GLOBALS['cache_instance']->extensionVersionMatches("theme"))) {
        // Load referal system from cache
-       global $cacheArray;
-       $cache = $cacheInstance->getArrayFromCache();
+       $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 ((getConfig('cache_themes') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_themes') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
        // Create cache file here
-       $cacheInstance->init("THEMES");
-       $cacheInstance->storeExtensionVersion("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->addRow($data);
+               $GLOBALS['cache_instance']->addRow($data);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Close the cache
-       $cacheInstance->finalize();
+       $GLOBALS['cache_instance']->finalize();
 
-       // Reload the cache
+       // Include loader again
        require(__FILE__);
 }