More fixes applied from profi-conecpt, cache system rewritten: now all cache files...

[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 8139855b7fe002d44eff4c37dfe25f77f2168157..a8ca165691d92f3c1bf03b3b16fb935ef8b1609f 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -38,16 +38,19 @@ if (!defined('__SECURITY')) {
 }
 
 // Next cached table is the configuration (config)...
-if ($cacheInstance->cache_file("config", true) == true) {
+if (($cacheInstance->cache_file("config", true)) && ($cacheInstance->ext_version_matches("sql_patches"))) {
        // Load config from cache
        global $cacheArray;
-       $cacheArrayConfig = $cacheInstance->cache_load();
+       $cacheArray['config'] = $cacheInstance->cache_load();
+
+       // TODO: Do we really need to cache the config???
 } elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
        $cacheInstance->cache_init("CONFIG");
+       $cacheInstance->store_extension_version("sql_patches");
 
        // Load all modules and their data
-       $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config", __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);