Global removed on many places, rewritten to use incrementConfigEntry()

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 7c3860c9e386b9b781beb759cf65efce862850b1..5768d4807b22dc8bc1490d9b2e3e492afa492102 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -356,7 +356,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                                $sql = str_replace("\n\n", "\n", $sql);
 
                                                                // And split it up against ;\n ...
-                                                               $SQLs = array_merge($SQLs, explode(";\n", $sql));
+                                                               $SQLs = merge_array($SQLs, explode(";\n", $sql));
                                                        } // END - if
                                                } // END - foreach
 
@@ -398,9 +398,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
-
-                                               // Close the link
-                                               SQL_CLOSE($link, __FILE__, __LINE__);
                                        } else {
                                                // Installation area not found!
                                                ADD_FATAL(INSTALL_MISSING_DUMPS);