Fixes for broken order page and themes

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

diff --git a/inc/loader/load_cache-filter.php b/inc/loader/load_cache-filter.php
index b158b05f9929c47aa7aef93d58513e6782baa658..5d98fc29de9487da559c107fc2200cbee5461d19 100644 (file)
--- a/inc/loader/load_cache-filter.php
+++ b/inc/loader/load_cache-filter.php
@@ -41,13 +41,16 @@ if (!defined('__SECURITY')) {
        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 filteruration (filter)...
 if (($GLOBALS['cache_instance']->loadCacheFile('filter')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load filter from cache
        $GLOBALS['cache_array']['filter'] = $GLOBALS['cache_instance']->getArrayFromCache();
 } elseif ((getOutputMode() != '1') && (isExtensionInstalled('sql_patches'))) {
        // Create cache file here
-       $GLOBALS['cache_instance']->init('FILTER');
+       $GLOBALS['cache_instance']->init();
 
        // Load all modules and their data
        $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC, `filter_id` ASC', __FILE__, __LINE__);
@@ -62,9 +65,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('filter')) && ($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]