From d0c77068404c95059e314a45f13099f27e741221 Mon Sep 17 00:00:00 2001
From: Michael Rosenberger <mr@simpelwebservice.de>
Date: Wed, 12 Dec 2018 20:54:56 +0100
Subject: [PATCH] Checks Mysql version only if no fatal error occured

Otherwise it is not possible to install current master due to fatal error.
---
 install/lib/class.FroxlorInstall.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php
index 79201c6a..b1a16c42 100644
--- a/install/lib/class.FroxlorInstall.php
+++ b/install/lib/class.FroxlorInstall.php
@@ -234,14 +234,14 @@ class FroxlorInstall
 				$fatal_fail = true;
 			}
 		}
-		$version_server = $db_root->getAttribute(PDO::ATTR_SERVER_VERSION);
-		$sql_mode = 'NO_ENGINE_SUBSTITUTION';
-		if (version_compare($version_server, '8.0.11', '<')) {
-			$sql_mode .= ',NO_AUTO_CREATE_USER';
-		}
-		$db_root->exec('SET sql_mode = "'.$sql_mode.'"');
 		
 		if (! $fatal_fail) {
+			$version_server = $db_root->getAttribute(PDO::ATTR_SERVER_VERSION);
+			$sql_mode = 'NO_ENGINE_SUBSTITUTION';
+			if (version_compare($version_server, '8.0.11', '<')) {
+				$sql_mode .= ',NO_AUTO_CREATE_USER';
+			}
+			$db_root->exec('SET sql_mode = "'.$sql_mode.'"');
 			
 			// ok, if we are here, the database connection is up and running
 			$content .= $this->_status_message('green', "OK");
@@ -531,11 +531,6 @@ class FroxlorInstall
 	{
 		$content = "";
 		$content .= $this->_status_message('begin', $this->_lng['install']['testing_new_db']);
-		$version_server = PDO::getAttribute(PDO::ATTR_SERVER_VERSION);
-		$sql_mode = 'NO_ENGINE_SUBSTITUTION';
-		if (version_compare($version_server, '8.0.11', '<')) {
-			$sql_mode .= ',NO_AUTO_CREATE_USER';
-		}
 		$options = array(
 			'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8'
 		);