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

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index 39b032af95..ad3342a435 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -37,36 +37,32 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-// Make cacheInstance global
-global $cacheInstance;
-
 // Next cached table is the configuration (config)...
-if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("config", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
 	// Load config from cache
-	global $cacheArray;
-	$cacheArray['config'] = $cacheInstance->getArrayFromCache();
+	$GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// @TODO: Do we really need to cache the config???
-} elseif ((getConfig('cache_config') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_config') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 	// Create cache file here
-	$cacheInstance->init("CONFIG");
-	$cacheInstance->storeExtensionVersion("sql_patches");
+	$GLOBALS['cache_instance']->init("CONFIG");
+	$GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
 
 	// Load all modules and their data
 	$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->addRow($data);
+		$GLOBALS['cache_instance']->addRow($data);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Close the cache
-	$cacheInstance->finalize();
+	$GLOBALS['cache_instance']->finalize();
 
-	// Reload the cache
-	LOAD_INC(__FILE__);
+	// Include loader again
+	require(__FILE__);
 }
 
 //