First batch of fixed language ids (renamed, see ticket #219)

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

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index bbcdb3711e000449ef81e76274ad601518ed8e1b..a894e0e77c455b11a8c72b60b5c3ef9963fd128d 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -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,14 +285,11 @@ 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)) {
-                               // Unregister it
-                               unregisterFilter(__FUNCTION__, __LINE__, $filterName, $filterFunction);
-
-                               // Skip this entry
-                               continue;
+                               // Should be fixed
+                               debug_report_bug(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - AUTO-UNREGISTERED!');
                        } // END - if
 
                        // Call the filter chain