Attempt to fix installation

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

diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
index 5c1e09ee112cd43e7d01fe6997f597cad3dd5edc..b8e2f287c4b210db747028aaee4c658049a3de73 100644 (file)
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -45,12 +45,8 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
        // You have submitted data then we have to reset the SQLs
        initSqls();
 
-       /*
-        * Restore PHPs error handler to prevent ours to handle errors,
-        * e.g. failed connection attempts. We want to handle them on
-        * our own.
-        */
-       restore_error_handler();
+       // Remove any existing "cache"
+       unset($GLOBALS['is_sql_link_up']);
 
        // Connect to database server
        SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
@@ -58,7 +54,7 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
        // Is the link up?
        if (SQL_IS_LINK_UP()) {
                // Seems to work, also right database?
-               if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+               if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
                        // Check for dumps
                        if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                // Installation area not found
@@ -90,7 +86,7 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                                                reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
                                        }
                                } // END - foreach
-                               //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
+                               //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), TRUE).'</pre>');
 
                                // Are some SQLs found?
                                if (countSqls() == 0) {