X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-config.php;h=1bf71bbc64fdccbd6935d22e712d681ecb22170f;hb=ee3e99bb6cc6ae2b14d12436f2bb0a23ab698ceb;hp=bb4c47583524c6856167acd478545f9f5937d02b;hpb=21f5c300431f4d667b2d197a69714c63ba37b950;p=mailer.git

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index bb4c475835..1bf71bbc64 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/09/2008 *
- * ===============                              Last change: 09/09/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/09/2008 *
+ * ===================                          Last change: 09/09/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-config.php                            *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,23 +46,21 @@ if (isInstallationPhase()) return;
 // Next cached table is the configuration (config)...
 if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
 	// Load config from cache
-	$GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
+	$config = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Swap cache
-	$config = array();
-	foreach ($GLOBALS['cache_array']['config'] as $entry => $array) {
+	foreach ($config as $entry => $array) {
 		// All config levels
 		foreach ($array as $key => $value) {
-			$config[$key][$entry] = $value;
+			$GLOBALS['cache_array']['config'][$key][$entry] = $value;
 		} // END - foreach
 	} // END - foreach
 
-	// Copy it back and remove dummy array
-	$GLOBALS['cache_array']['config'] = $config;
+	// Remove dummy array
 	unset($config);
-} elseif (getOutputMode() != '1') {
+} elseif (isHtmlOutputMode()) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init('CONFIG');
+	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
 	$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_config` ORDER BY `config` ASC', __FILE__, __LINE__);
@@ -78,9 +75,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_in
 	// Close the cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]