Rewrites not to init config in config-functions.php (some still remain, many untested)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index d799dedfebab43ae84a41f34f886dc9da390552b..42b6a887dc41966c7e792983c6961eedb17841f0 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -69,10 +69,7 @@ initFatalMessages();
 initMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (!isInstallationPhase())) {
-       // Load "databases" aka static arrays
-       loadIncludeOnce('inc/databases.php');
-
+if (!isInstalling()) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
@@ -112,12 +109,12 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Run the init filter chain
                                runFilterChain('init');
 
+                               // Load "databases" aka static arrays
+                               loadIncludeOnce('inc/databases.php');
+
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
-                               // Cound module here
-                               countModuleHit(getModule());
-
                                // Admin module should be accessable by guests to login
                                if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
                                        // This is fine and can be ignored
@@ -149,16 +146,16 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getOutputMode() == '1') {
+       if (getOutputMode() == 1) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
        // Set other missing variables
-       if (!isOutputModeSet()) setOutputMode('0');
+       if (!isOutputModeSet()) setOutputMode(0);
 
        // Include more
-       foreach (array('inc/databases.php','inc/db/lib.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       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) {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
@@ -167,7 +164,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        loadIncludeOnce('inc/load_config.php');
 
        // Are we installation routine?
-       if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
+       if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if
@@ -183,7 +180,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 }
 
 // Handle fatal errors
-handleFatalErrors();
+runFilterChain('handle_fatal_errors');
 
 // [EOF]
 ?>