X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Floader%2Fload_cache-them.php;h=0b453f1b4bfa16b697f7e2c42ef028ca48b6a10c;hb=397eb5dee2611cfaa1ff494d73e6785b88109cd6;hp=fde1f1bc54627c016f6ac8aae65d2f7151e5088f;hpb=f13b0c89b6dce2dc31ef3c58f0e2ad4821d7bee8;p=mailer.git

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index fde1f1bc54..0b453f1b4b 100644
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -35,13 +35,19 @@
 if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
+} elseif (!EXT_IS_ACTIVE("theme")) {
+	// Skip this loader
+	return false;
 }
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Next cached table is the referal system (themes)...
-if (($cacheInstance->cache_file("themes")) && ($cacheInstance->ext_version_matches("theme"))) {
+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();
@@ -62,34 +68,31 @@ if (($cacheInstance->cache_file("themes")) && ($cacheInstance->ext_version_match
 
 	// Remove dummy array
 	unset($cache);
-} elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_themes') == "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") {
-		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM "._MYSQL_PREFIX."_themes ORDER BY id", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);
 	} else {
-		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM "._MYSQL_PREFIX."_themes ORDER BY id", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __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__);
+	LOAD_INC(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>