X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-filter.php;h=47f903ff78bad0e6b951a735fdbfca8a124d243c;hb=8fc1c99d323e7599dd91071a5a772261b5d079a7;hp=b158b05f9929c47aa7aef93d58513e6782baa658;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/loader/load_cache-filter.php b/inc/loader/load_cache-filter.php
index b158b05f99..47f903ff78 100644
--- a/inc/loader/load_cache-filter.php
+++ b/inc/loader/load_cache-filter.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/26/2008 *
- * ===============                              Last change: 08/26/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 08/26/2008 *
+ * ===================                          Last change: 08/26/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-filter.php                            *
@@ -41,13 +41,19 @@ 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'))) {
+
+	// Prepare the array here
+	prepareFilterArray();
+} 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 +68,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]