Possible final fixes for user login, debug lines rewritten to logfile, some old lost...

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 8619a8510926b6439da01c74ad2093d1f9fd4cbf..bd91776d29aeff97a51e04932384e6dc5c7c8c9e 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -102,9 +102,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Load cache
                                loadIncludeOnce('inc/load_cache.php');
 
-                               // Run the init filter chain
-                               runFilterChain('init');
-
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
@@ -148,14 +145,11 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('_DB_TYPE', 'mysql3');
 
        // Include more
-       foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
 
-       // Load config
-       loadIncludeOnce('inc/load_config.php');
-
        // Init filter system here
        initFilterSystem();