X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=a894e0e77c455b11a8c72b60b5c3ef9963fd128d;hb=3971209b0996a1b0506d6ddaf7326432933eae1b;hp=1960dadff976e7530b416c28184d68e86169fc8b;hpb=5cf56305e05df061e2d3ef50f3019a8414aa6ca8;p=mailer.git diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 1960dadff9..a894e0e77c 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -59,12 +59,15 @@ function initFilterSystem () { // Init add $add = ''; if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) { - $add = ", `filter_counter`"; + $add = ',`filter_counter`'; } // END - if // Load all filters $result = SQL_QUERY('SELECT - `filter_name`,`filter_function`,`filter_active`' . $add . ' + `filter_name`, + `filter_function`, + `filter_active` + ' . $add . ' FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY @@ -225,10 +228,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REGISTER: filterName=' . $filterName . ',filterFunction=' . $filterFunction); $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'A'; $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0'; - } elseif (($silentAbort === false) && (!function_exists($filterFunction))) { - // Please report them all! - debug_report_bug(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',silentAbort=false,force=' . intval($force) . ',dry_run=' . intval($dry_run) . ' - NOT FOUND!'); - } + } // END - if //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - EXIT!'); } @@ -285,7 +285,7 @@ function runFilterChain ($filterName, $filterData = NULL) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running: name=' . $filterName . ',func=' . $filterFunction . ',active=' . $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'))) { + 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)) { // Should be fixed