Functions imported, some dev-scripts added

[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 dc7bc67c4e859752881c78029277defbbe873418..39b032af951642da048e0253eb17dbbf7acc5f77 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -46,14 +46,14 @@ if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensio
        global $cacheArray;
        $cacheArray['config'] = $cacheInstance->getArrayFromCache();
 
-       // TODO: Do we really need to cache the config???
+       // @TODO: Do we really need to cache the config???
 } 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);
@@ -66,7 +66,7 @@ if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensio
        $cacheInstance->finalize();
 
        // Reload the cache
-       require(__FILE__);
+       LOAD_INC(__FILE__);
 }
 
 //