Network AllAds4You now with request parameters

[mailer.git] / inc / loader / load_cache-config.php

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index bb4c47583524c6856167acd478545f9f5937d02b..fd16f1206fe6f9b978dae9fb2332c5e53877968a 100644 (file)
--- 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                            *
@@ -18,6 +18,7 @@
  * 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 +48,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 (getOutputMode() != 1) {
        // 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 +77,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]