Fixes for the fix

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

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index dca5b9ec6cff5fa9a013f1e610180f905c8194ce..26c986403f362f4287ccbaab743b22831ecf6bba 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -96,7 +96,7 @@ ORDER BY
                                $filterFunction = $filterArray['filter_function'];
 
                                // Set counter to default
-                               $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = 0;
+                               $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
 
                                // Mark this filter as loaded (from database)
                                $GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction] = true;
@@ -119,13 +119,15 @@ ORDER BY
        // Init filters
        registerFilter('init', 'LOAD_CONFIGURATION');
        registerFilter('init', 'INIT_EXTENSIONS');
+       registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
+       registerFilter('init', 'INIT_RANDOM_NUMBER');
        registerFilter('init', 'CHECK_SVN_REVISION');
        registerFilter('init', 'RUN_DAILY_RESET');
-       registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'TRIGGER_SENDING_POOL');
        registerFilter('init', 'DETERMINE_USERNAME');
        registerFilter('init', 'DETERMINE_WHAT_ACTION');
+       registerFilter('init', 'COUNT_MODULE');
        registerFilter('init', 'UPDATE_LOGIN_DATA');
        registerFilter('init', 'ACTIVATE_EXCHANGE');
 
@@ -156,6 +158,7 @@ ORDER BY
        // Register shutdown filters
        registerFilter('shutdown', 'FLUSH_FILTERS');
        registerFilter('shutdown', 'FLUSH_STATS');
+       registerFilter('shutdown', 'FLUSH_TEMPLATE_CACHE');
        registerFilter('shutdown', 'FLUSH_OUTPUT');
 
        // Compiling code
@@ -173,6 +176,14 @@ ORDER BY
 
        // Exclude some users
        registerFilter('exclude_users', 'HTML_INCLUDE_USERS');
+
+       // Handling of fatal errors
+       registerFilter('handle_fatal_errors', 'HANDLE_FATAL_ERRORS');
+
+       // Page footer filters
+       registerFilter('page_footer', 'HANDLE_FATAL_ERRORS');
+       registerFilter('page_footer', 'DISPLAY_COPYRIGHT');
+       registerFilter('page_footer', 'DISPLAY_PARSING_TIME');
 }
 
 // "Registers" a new filter function
@@ -204,7 +215,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
                // Simply add it to the array
                //* DEBUG: */ print __FUNCTION__.': filterName='.$filterName.',filterFunction='.$filterFunction.'<br />';
                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'A';
-               $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = 0;
+               $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
        } // END - if
 }