Forgot this :(

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

diff --git a/inc/loader/load-filter.php b/inc/loader/load-filter.php
index 61bb5ffe1d5f86e0eff96c0d07952aabadbafc6b..37566647c21c06f812ecb78afbdbe0a965a05da1 100644 (file)
--- a/inc/loader/load-filter.php
+++ b/inc/loader/load-filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the filteruration (filter)...
@@ -50,12 +50,12 @@ if (($GLOBALS['cache_instance']->loadCacheFile('filter')) && ($GLOBALS['cache_in
 
        // Prepare the array here
        prepareFilterArray();
-} elseif ((isHtmlOutputMode()) && (isExtensionInstalled('sql_patches'))) {
+} elseif (((isHtmlOutputMode()) || (isRawOutputMode())) && (isExtensionInstalledAndNewer('sql_patches', '0.5.9'))) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
        // Query for all filters
-       $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC,`filter_id` ASC', __FILE__, __LINE__);
+       $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC, `filter_id` ASC', __FILE__, __LINE__);
 
        // Load all filters
        while ($content = SQL_FETCHARRAY($result)) {