X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-config.php;h=cbb44999bb6711b4474c14a8199d4df80c562a9f;hb=aac3cb15887577d2016bb5b4de91ad4da5b9cc6f;hp=133a6dcbefdc0d41170646af8d5d4d800315c416;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index 133a6dcbef..cbb44999bb 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,39 +38,33 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	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();
-
-	// TODO: Do we really need to cache the config???
-} elseif ((getConfig('cache_config') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+	$GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
+} 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__);
+	$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
+	// Include loader again
 	require(__FILE__);
 }