Fix for parser error

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 6457c4b0b8c49e769624ec0bbbd56dc87a47a82c..5f9fa665c497d402768a257adfa84ae2a8fc1b83 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -62,7 +62,7 @@ function initFilterSystem () {
        $GLOBALS['filters']['counter'] = array();
 
        // Load all saved filers if sql_patches is updated
-       if (isset($GLOBALS['cache_array']['filter'])) {
+       if (isset($GLOBALS['cache_array']['filter']['filter_name'])) {
                // Found in cache so rewrite the array
                $filterArray = array();
                foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) {
@@ -118,38 +118,38 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
 
                // Free result
                SQL_FREERESULT($result);
+       }
 
-               // Init filters
-               registerFilter('init', 'UPDATE_LOGIN_DATA');
-               registerFilter('init', 'INIT_RANDOMIZER');
+       // Init filters
+       registerFilter('init', 'UPDATE_LOGIN_DATA');
+       registerFilter('init', 'INIT_RANDOMIZER');
 
-               // Login failures handler
-               registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
+       // Login failures handler
+       registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
 
-               // Filters for pre-extension-registration
-               registerFilter('pre_extension_installed', 'RUN_SQLS');
+       // Filters for pre-extension-registration
+       registerFilter('pre_extension_installed', 'RUN_SQLS');
 
-               // Filters for post-extension-registration
-               registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
-               registerFilter('post_extension_installed', 'SOLVE_TASK');
-               registerFilter('post_extension_installed', 'LOAD_INCLUDES');
-               registerFilter('post_extension_installed', 'REMOVE_UPDATES');
+       // Filters for post-extension-registration
+       registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
+       registerFilter('post_extension_installed', 'SOLVE_TASK');
+       registerFilter('post_extension_installed', 'LOAD_INCLUDES');
+       registerFilter('post_extension_installed', 'REMOVE_UPDATES');
 
-               // Solving tasks
-               registerFilter('solve_task', 'SOLVE_TASK');
+       // Solving tasks
+       registerFilter('solve_task', 'SOLVE_TASK');
 
-               // Loading includes in general
-               registerFilter('load_includes', 'LOAD_INCLUDES');
+       // Loading includes in general
+       registerFilter('load_includes', 'LOAD_INCLUDES');
 
-               // Run SQLs
-               registerFilter('run_sqls', 'RUN_SQLS');
+       // Run SQLs
+       registerFilter('run_sqls', 'RUN_SQLS');
 
-               // Admin ACL check
-               registerFilter('check_admin_acl', 'CHECK_ADMIN_ACL');
+       // Admin ACL check
+       registerFilter('check_admin_acl', 'CHECK_ADMIN_ACL');
 
-               // Register shutdown filters
-               registerFilter('shutdown', 'FLUSH_FILTERS');
-       } // END - if
+       // Register shutdown filters
+       registerFilter('shutdown', 'FLUSH_FILTERS');
 }
 
 // "Registers" a new filter function
@@ -205,7 +205,7 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
 }
 
 // "Runs" the given filters, data is optional and can be any type of data
-function runFilterChain ($filterName, $data = null, $silentAbort = true) {
+function runFilterChain ($filterName, $data = null) {
        // Is that filter chain there?
        if (!isset($GLOBALS['filters']['chains'][$filterName])) {
                // We should find all these non-existing filter chains