Rewrites for installation phase:

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 0b8928b27ce1bfc126c2da8a6c11284b2f161d04..a4288ac58035d5e2cec6dcc726b0a78f3a5d4d13 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -193,6 +193,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                initSqls();
 
                                // Connect to MySQL server
                                initSqls();
 
                                // Connect to MySQL server

+                               restore_error_handler();

                                SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
 
                                // Is the link up?
                                SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
 
                                // Is the link up?


@@ -267,6 +268,9 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);

+
+                                       // We have handled all fatal errors here
+                                       initFatalMessages();

                                } else {
                                        // Installation is done!
                                        redirectToUrl('install.php?page=finished');
                                } else {
                                        // Installation is done!
                                        redirectToUrl('install.php?page=finished');