Fix for missing array elements

[mailer.git] / inc / filter-functions.php

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 7bc55f018c67f9880e6e7227a525e1321f526d93..40b673459953cf94236751389be27d76c1762d81 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -62,7 +62,7 @@ function initFilterSystem () {
                $add = '';
                if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) $add = ", `filter_counter`";
 
-               // Load all active filers
+               // Load all filters
                $result = SQL_QUERY("SELECT
        `filter_name`,`filter_function`,`filter_active`".$add."
 FROM
@@ -192,10 +192,10 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
 
        // Is that filter already there?
        if ((isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === false)) {
-               // Then abort here
-               if ($silentAbort === false) {
+               // In installation phase we always want to abort
+               if (($silentAbort === false) || (isInstallationPhase())) {
                        // Add fatal message
-                       addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter chain %s has already filter function %s registered!", $filterName, $filterFunction));
+                       debug_report_bug(sprintf("[%s:%s] Filter chain %s has already filter function %s registered!", __FUNCTION__, __LINE__, $filterName, $filterFunction));
                } // END - if
 
                // Abort here
@@ -262,9 +262,9 @@ function runFilterChain ($filterName, $data = null) {
        // Then run all filters
        foreach ($GLOBALS['cache_array']['filter']['chains'][$filterName] as $filterFunction => $active) {
                // Debug message
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running: name={$filterName},func={$filterFunction},active={$active}");
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running: name=' . $filterName . ',func=' . $filterFunction . ',active=' . $active);
 
-               // Is the filter active?
+               // Is the filter active or newly added??
                if (($active == 'Y') || ($active == 'A') || ((in_array($filterName, array('shutdown','extension_remove','post_extension_run_sql'))) && ($active == 'R'))) {
                        // Is this filter there?
                        if (!function_exists($filterFunction)) {
@@ -276,14 +276,14 @@ function runFilterChain ($filterName, $data = null) {
                        } // END - if
 
                        // Call the filter chain
-                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName.'/'.$filterFunction.',[]='.gettype($returnValue));
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName . '/' . $filterFunction . ',[]=' . gettype($returnValue));
                        $returnValue = call_user_func_array($filterFunction, array($returnValue));
 
                        // Update usage counter
                        countFilterUsage($filterName, $filterFunction);
                } elseif (isDebugModeEnabled()) {
                        // Debug message
-                       logDebugMessage(__FUNCTION__, __LINE__, "Skipped: name={$filterName},func={$filterFunction},active={$active}");
+                       logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: name=' . $filterName . ',func=' . $filterFunction . ',active=' . $active);
                }
        } // END - foreach