Fixes for installation phase, old lost call of FILTER_COMPILE_CONFIG() removed

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 45d1e87f67648beed2f9f92030aa12aafee867bc..8619a8510926b6439da01c74ad2093d1f9fd4cbf 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -71,8 +71,8 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
@@ -156,15 +156,15 @@ if (!isInstalling()) {
        // Load config
        loadIncludeOnce('inc/load_config.php');
 
+       // Init filter system here
+       initFilterSystem();
+
        // Are we installation routine?
        if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if
 
-       // Init filter system here
-       initFilterSystem();
-
        // Load cache
        loadIncludeOnce('inc/load_cache.php');