Fixes for broken order page and themes

[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 8fd6c9aecfd5fd7d6d9c2432ec2e0dd1ce085aa8..2c9e2bf35ee02b1626c411035d436fd7f3db2437 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -41,26 +41,27 @@ if (!defined('__SECURITY')) {
        die();
 }
 
+// Use this code if you don't want to run this cache loader on installation phase
+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') {
        // 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__);
@@ -75,9 +76,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]