X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-config.php;h=39b032af951642da048e0253eb17dbbf7acc5f77;hp=8139855b7fe002d44eff4c37dfe25f77f2168157;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index 8139855b7f..39b032af95 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -37,34 +37,37 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Next cached table is the configuration (config)...
-if ($cacheInstance->cache_file("config", true) == true) {
+if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
 	// Load config from cache
 	global $cacheArray;
-	$cacheArrayConfig = $cacheInstance->cache_load();
-} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+	$cacheArray['config'] = $cacheInstance->getArrayFromCache();
+
+	// @TODO: Do we really need to cache the config???
+} elseif ((getConfig('cache_config') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file here
-	$cacheInstance->cache_init("CONFIG");
+	$cacheInstance->init("CONFIG");
+	$cacheInstance->storeExtensionVersion("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);
+		$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();
-
 //
 ?>