Previous fix fixed, a lot constants rewritten (unfinished)

[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 86fd873b3abc14ad3d1162d90ddc0b37d9b2bd85..133a6dcbefdc0d41170646af8d5d4d800315c416 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -37,6 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Next cached table is the configuration (config)...
 if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
        // Load config from cache
@@ -44,13 +47,13 @@ if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensio
        $cacheArray['config'] = $cacheInstance->getArrayFromCache();
 
        // TODO: Do we really need to cache the config???
-} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_config') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->init("CONFIG");
        $cacheInstance->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);