Conflict solved between ext-profile and ext-update

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

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index da82aac80e20248ccd3617a9191baebdf946e0b6..dc5e4973b58180856434b58545704d978692eb80 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -44,6 +44,9 @@ if (!defined('__SECURITY')) {
        return false;
 }
 
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+
 // Next cached table is the referal system (themes)...
 if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) {
        // Load referal system from cache
@@ -70,7 +73,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
        unset($cache);
 } elseif (getOutputMode() != '1') {
        // Create cache file here
-       $GLOBALS['cache_instance']->init('THEMES');
+       $GLOBALS['cache_instance']->init();
 
        // Load all themes and their data
        if (getExtensionVersion('theme') >= '0.0.7') {
@@ -89,9 +92,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
        // Close the cache
        $GLOBALS['cache_instance']->storeExtensionVersion('theme');
        $GLOBALS['cache_instance']->finalize();
-
-       // Include loader again
-       loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]