Many rewrites to get rid of dublicate modreg inserts while ext-cache is registered

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index e8f598c857c1f18dc1c89c20055ef1f343e61b3b..433f4958099751fac2a590f2c0131458aee57208 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -115,14 +115,14 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
        // Filters for post-extension-registration
        registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
        registerFilter('post_extension_installed', 'SOLVE_TASK');
-       registerFilter('post_extension_installed', 'loadIncludeLUDES');
+       registerFilter('post_extension_installed', 'LOAD_INCLUDES');
        registerFilter('post_extension_installed', 'REMOVE_UPDATES');
 
        // Solving tasks
        registerFilter('solve_task', 'SOLVE_TASK');
 
        // Loading includes in general
-       registerFilter('load_includes', 'loadIncludeLUDES');
+       registerFilter('load_includes', 'LOAD_INCLUDES');
 
        // Run SQLs
        registerFilter('run_sqls', 'RUN_SQLS');
@@ -190,21 +190,15 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
 function runFilterChain ($filterName, $data = null, $silentAbort = true) {
        // Is that filter chain there?
        if (!isset($GLOBALS['filters']['chains'][$filterName])) {
-               // Then abort here (quick'N'dirty hack)
-               if (($silentAbort === false) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
-                       // Add fatal message
-                       addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
-               } // END - if
-
-               // Abort here
-               return false;
+               // We should find all these non-existing filter chains
+               debug_report_bug('Filter chain '.$filterName.' not found!');
        } // END - if
 
        // Default return value
        $returnValue = $data;
 
        // Then run all filters
-       foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction=>$active) {
+       foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction => $active) {
                // Debug message
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Running: name={$filterName},func={$filterFunction},active={$active}");
 
@@ -400,7 +394,7 @@ function FILTER_SOLVE_TASK ($data) {
 }
 
 // Filter to load include files
-function FILTER_loadIncludeLUDES () {
+function FILTER_LOAD_INCLUDES () {
        // Default is $data as inclusion list
        $data = GET_INC_POOL();