Fixes for MT_WORD vs. install vs. installed

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 533a0f0af87c6177a981b9227f5b6528063324d2..64de90acd5085ad54d94acc9ac8b202b1d983f42 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -241,9 +241,9 @@ function FILTER_FLUSH_FILTERS () {
        $SQLs = array();
 
        // Is a database link here and not in installation mode?
-       if ((!SQL_IS_LINK_UP()) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
+       if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
                // Abort here
-               addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), array($filterFunction, $filterName));
+               addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
                return false;
        } // END - if
 
@@ -388,8 +388,7 @@ function FILTER_LOAD_INCLUDES ($data) {
        // Is it an array?
        if ((!isset($data)) || (!is_array($data))) {
                // Then abort here
-               DEBUG_LOG(__FILE__, __LINE__, "INC_POOL is no array!");
-               return $data;
+               debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($INC_POOL)));
        } elseif (isset($data['inc_pool'])) {
                // Use this as new inclusion pool!
                $INC_POOL = $data['inc_pool'];