Final fixes for 'loading cache vs. filters vs. extensions' construct

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

diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php
index 7d8c1aaa3716a734d6a4c2897fbdbe0400c6c4bf..11a47438ae5135a2a9ee74a060292aba47a4a78f 100644 (file)
--- a/inc/loader/load_cache-refdepths.php
+++ b/inc/loader/load_cache-refdepths.php
@@ -37,34 +37,35 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-// Next cached table is the referral system (refdepths)...
-if ($cacheInstance->cache_file("refdepths", true) == true) {
-       // Load referral system from cache
+// Make cacheInstance global
+global $cacheInstance;
+
+// Next cached table is the referal system (refdepths)...
+if (($cacheInstance->loadCacheFile("refdepths")) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+       // Load referal system from cache
        global $cacheArray;
-       $cacheArray['ref_depths'] = $cacheInstance->cache_load();
-} elseif (($_CONFIG['cache_refdepth'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+       $cacheArray['ref_depths'] = $cacheInstance->getArrayFromCache();
+} elseif ((getConfig('cache_refdepth') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("REFDEPTHS");
+       $cacheInstance->init("REFDEPTHS");
+       $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data
        $result = SQL_QUERY("SELECT id, level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
-               $cacheInstance->add_row($data);
+               $cacheInstance->addRow($data);
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Close the cache
-       $cacheInstance->cache_close();
+       $cacheInstance->finalize();
 
        // Reload the cache
        require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>