Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index fae66b3b568d0b6bd4fc9ba83a9b5dd6fc6b0f11..a1544e6c3c0a31408c4b4f84402165ff6be13cf5 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -154,14 +154,17 @@ if ($cacheMode == "load") {
        // No database load needed
        $res_ext_crt = false;
 
-       // Load more cache files (like admins)
-       require_once(PATH."inc/load_cache.php");
-
        // Load all extension files
        foreach ($EXT_POOL as $ext) {
                LOAD_EXTENSION($ext);
        } // END - foreach
 
+       // Init filter system
+       INIT_FILTER_SYSTEM();
+
+       // Load more cache files (like admins)
+       require_once(PATH."inc/load_cache.php");
+
        // Remove array
        unset($EXT_POOL);
 } else {
@@ -201,7 +204,6 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 
                // Load extensions
                $file1 = sprintf("%sinc/extensions/ext-%s.php", PATH, $content['ext_name']);
-               $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
 
                // Does the extension file exists?
                if (FILE_READABLE($file1)) {
@@ -250,6 +252,9 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
                }
        } // END - while
 
+       // Init filter system
+       INIT_FILTER_SYSTEM();
+
        if ($cacheMode == "init") {
                // Close cache file
                $cacheInstance->finalize();