More SQL rewrites, TODO: Put all table and column names in backticks (`)

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

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index f67cc108a525b1fc475d9b0d0d244fd09bbb45b2..a92039fe182aa3186aa097b89d235f5813483024 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -37,11 +37,11 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-// Next cached table is the referral system (themes)...
-if (($cacheInstance->cache_file("themes", true) == true) && ($cacheInstance->ext_version_matches("theme"))) {
-       // Load referral system from cache
+// Next cached table is the referal system (themes)...
+if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersionMatches("theme"))) {
+       // Load referal system from cache
        global $cacheArray;
-       $cache = $cacheInstance->cache_load();
+       $cache = $cacheInstance->getArrayFromCache();
 
        // Restructure the array
        $cacheArray['themes'] = array();
@@ -64,8 +64,8 @@ if (($cacheInstance->cache_file("themes", true) == true) && ($cacheInstance->ext
        unset($cache);
 } elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
        // Create cache file here
-       $cacheInstance->cache_init("THEMES");
-       $cacheInstance->store_extension_version("theme");
+       $cacheInstance->init("THEMES");
+       $cacheInstance->storeExtensionVersion("theme");
 
        // Load all themes and their data
        if (GET_EXT_VERSION("theme") >= "0.0.7") {
@@ -75,21 +75,18 @@ if (($cacheInstance->cache_file("themes", true) == true) && ($cacheInstance->ext
        }
        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();
-
 //
 ?>