and rewritten to functions

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index dad33f5438c98e51f9164c01a92ab512dc337287..1b8d1f486c1219b135e18b62ac8f6415cfe80e74 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -269,11 +269,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                        $SQLs = array();
 
                        // Connect to MySQL server
-                       $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
-                       if ($link) {
+                       SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+                       if (SQL_IS_LINK_UP()) {
                                // Seems to work, also right database?
-                               $db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__);
-                               if ($db) {
+                               if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
                                        // Automatically run install.sql
                                        if ((FILE_READABLE($_POST['spath']."install/tables.sql")) && (FILE_READABLE($_POST['spath']."install/menu-".GET_LANGUAGE().".sql"))) {
                                                // Both exists so import them