Fixed logfile writing in installation phase, .revision is now ignored

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index c932435b45991ba329f72494c5c7c20fef0479c7..2a442bf48170a7589aa01404d595f9a88928a096 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,11 +57,8 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'fi
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Register shutdown hook
-register_shutdown_function('__SHUTDOWN_HOOK');
-
 // Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isInstalled())) {
+if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
        OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
        if (isInstalled()) {
@@ -238,7 +235,7 @@ if ((!isInstalling()) && (isInstalled())) {
        LOAD_EXTENSION("sql_patches");
 }
 
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != "1")) {
        // One or more fatal error(s) occur during connect...
        LOAD_INC_ONCE("inc/header.php");
        LOAD_INC_ONCE("inc/fatal_errors.php");