Fixes for broken order page and themes

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

diff --git a/inc/loader/load_cache-extension.php b/inc/loader/load_cache-extension.php
index d765f85846991b6f072a894d730cae44cf8d0be4..00c56c5b72c7713e5ed10b094290471c3521d0d3 100644 (file)
--- a/inc/loader/load_cache-extension.php
+++ b/inc/loader/load_cache-extension.php
@@ -43,6 +43,9 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
        die();
 } // END - if
 

+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+

 // Next cached table is the extension
 if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load extension from cache
 // Next cached table is the extension
 if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load extension from cache


@@ -130,7 +133,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        unset($EXT_POOL);
 } elseif (getOutputMode() != '1') {
        // Create cache file here
        unset($EXT_POOL);
 } elseif (getOutputMode() != '1') {
        // Create cache file here

-       $GLOBALS['cache_instance']->init('extension');
+       $GLOBALS['cache_instance']->init();

 
        // Add more if sql_patches is recent enougth
        $add = '';
 
        // Add more if sql_patches is recent enougth
        $add = '';


@@ -179,9 +182,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        // Close the cache
        $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
        $GLOBALS['cache_instance']->finalize();
        // Close the cache
        $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
        $GLOBALS['cache_instance']->finalize();

-
-       // Include loader again
-       loadInclude('inc/loader/'.basename(__FILE__));

 }
 
 // [EOF]
 }
 
 // [EOF]