Functions renamed to new naming convetion, TODOs.txt updated

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index f6ba3df7f3388d4bfdcb7e4b2484aa6afa233ca0..96b15450cd3c61e3b4b3a2d1afdc2c621c5c7d23 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -55,7 +55,7 @@ $GLOBALS['cache_array'] = array();
 // Skip loading extensions
 if ((!isInstalled()) || (isInstalling())) {
        // Init filter system here
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 
        // Skip loading
        return;
@@ -185,7 +185,7 @@ if ($GLOBALS['cache_mode'] == 'load') {
        } // END - foreach
 
        // Init filter system
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 
        // Load more cache files (like admins)
        loadIncludeOnce('inc/load_cache.php');
@@ -275,7 +275,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == 'init') && (
        } // END - while
 
        // Init filter system
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 
        if ($GLOBALS['cache_mode'] == 'init') {
                // Close cache file
@@ -289,7 +289,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == 'init') && (
        SQL_FREERESULT($res_ext_crt);
 } elseif (!EXT_IS_ACTIVE('cache')) {
        // Init filter system even when there are no extensions installed. #16
-       INIT_FILTER_SYSTEM();
+       initFilterSystem();
 }
 
 // Run the filter
@@ -301,11 +301,11 @@ if (!empty($DEL[0])) {
        foreach ($DEL as $del_ext) {
                // First remove entry from extensions table
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-                       array($del_ext), __FILE__, __LINE__);
+               array($del_ext), __FILE__, __LINE__);
 
                // Remove (maybe?) found tasks (main task and possible updates
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
-                       array($del_ext), __FILE__, __LINE__);
+               array($del_ext), __FILE__, __LINE__);
        } // END - foreach
 
        // I think it's not neccessary to run the optimization function here