Properties set

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

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index a8ca165691d92f3c1bf03b3b16fb935ef8b1609f..49402d59d2c22aa807078d606084be942ebb9ba0 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                  *
@@ -38,36 +43,30 @@ if (!defined('__SECURITY')) {
 }
 
 // Next cached table is the configuration (config)...
-if (($cacheInstance->cache_file("config", true)) && ($cacheInstance->ext_version_matches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("config", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
        // Load config from cache
-       global $cacheArray;
-       $cacheArray['config'] = $cacheInstance->cache_load();
-
-       // TODO: Do we really need to cache the config???
-} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+       $GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
+} elseif ((getConfig('cache_config') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("CONFIG");
-       $cacheInstance->store_extension_version("sql_patches");
+       $GLOBALS['cache_instance']->init("CONFIG");
+       $GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data
-       $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}_config` ORDER BY config ASC", __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();
-
 //
 ?>