X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-filter.php;h=300bdd64f981f2ee2176ba218602b891411a66c4;hb=9e3656b7346cd7ba24f241f2e0378b9e4675acd3;hp=74bff13b68459895400d8fd2b914c3b18cf978cc;hpb=06d97fddd5c72e2b1c14ddb855b7eddc53f169a7;p=mailer.git

diff --git a/inc/loader/load_cache-filter.php b/inc/loader/load_cache-filter.php
index 74bff13b68..300bdd64f9 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                            *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,9 +49,12 @@ if (isInstallationPhase()) return;
 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__);
@@ -65,9 +69,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]