From 1c21506139a659255497da3845cd903cf343d3e8 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 9 Oct 2016 07:47:57 +1100 Subject: [PATCH] CRM-17917 Fix d8 install requirements --- Civi/Install/Requirements.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Civi/Install/Requirements.php b/Civi/Install/Requirements.php index 16fe39bb6b..fb601d7b54 100644 --- a/Civi/Install/Requirements.php +++ b/Civi/Install/Requirements.php @@ -227,7 +227,8 @@ class Requirements { 'details' => "Connected", ); - $conn = @mysqli_connect($db_config['host'], $db_config['username'], $db_config['password']); + $host = isset($db_config['server']) ? $db_config['server'] : $db_config['host']; + $conn = @mysqli_connect($host, $db_config['username'], $db_config['password']); if (!$conn) { $results['details'] = mysqli_connect_error(); @@ -256,7 +257,8 @@ class Requirements { 'severity' => $this::REQUIREMENT_OK, ); - $conn = @mysqli_connect($db_config['host'], $db_config['username'], $db_config['password']); + $host = isset($db_config['server']) ? $db_config['server'] : $db_config['host']; + $conn = @mysqli_connect($host, $db_config['username'], $db_config['password']); if (!$conn || !($info = mysqli_get_server_info($conn))) { $results['severity'] = $this::REQUIREMENT_WARNING; $results['details'] = "Cannot determine the version of MySQL installed. Please ensure at least version {$min} is installed."; -- 2.25.1