From d5128a1889a547da9ab4eacf15e5cbc0276b712b Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sat, 10 Dec 2016 23:12:03 +0100
Subject: [PATCH] FIX #6129 : correct test on database connection
---
htdocs/install/step1.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index ec437709487..4389cbf2c0d 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -243,13 +243,13 @@ if (! $error) {
dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
- if (empty($db_create_database) && $db->connected && !$db->database_selected) {
+ if (empty($db_create_database) && $db->connected && !$db->database_selected) {
print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound",$db_name).'</div>';
print '<br>';
if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
print $langs->trans("ErrorGoBackAndCorrectParameters");
$error++;
- } elseif ($db->error && (empty($db_create_database) && $db->connected)) {
+ } elseif ($db->error && ! (! empty($db_create_database) && $db->connected)) {
// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
else print '<div class="error">'.$db->error.'</div>';
@@ -991,4 +991,3 @@ function write_conf_file($conffile)
return $error;
}
-
--
GitLab