Function INIT_FILTER_SYSTEM() is now being executed even when there are no extensions...

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 7ec8ecc44f4a81046218db101cfbb23b069a4e75..4fc530349ea17a17f1bd50c7b09c23aa44bd5984 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();
@@ -260,10 +265,13 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 
        // Free memory
        SQL_FREERESULT($res_ext_crt);
-} // END - if
+} else {
+       // Init filter system even when there are no extensions installed. #16
+       INIT_FILTER_SYSTEM();
+}
 
 // Run the filter
-RUN_FILTER('load_includes');
+RUN_FILTER('load_includes', $INC_POOL);
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {