Several rewrites/renames, fixes for installation. Resolves #104

[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 150b7a4e62f761d66d3a3a5e94ae3d6c77cad907..ad5b5dfcd9cda20226beaa996f41e9e1c1c8acde 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -38,32 +38,31 @@ if (!defined('__SECURITY')) {
 }
 
 // Next cached table is the configuration (config)...
-if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("config", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
        // Load config from cache
-       global $cacheArray;
-       $cacheArray['config'] = $cacheInstance->getArrayFromCache();
+       $GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
-       // TODO: Do we really need to cache the config???
-} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+       // @TODO: Do we really need to cache the config???
+} elseif ((getConfig('cache_config') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
        // Create cache file here
-       $cacheInstance->init("CONFIG");
-       $cacheInstance->storeExtensionVersion("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->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
-       require(__FILE__);
+       LOAD_INC(__FILE__);
 }
 
 //