CRM-17917 - More fixes for D8 installer

diff --git a/Civi/Install/Requirements.php b/Civi/Install/Requirements.php
index fb601d7b54c3af38e8cc00725cb8df10f04e8cee..5677d970a9a801a84abc01be6b96b62dc6316ed4 100644 (file)
--- a/Civi/Install/Requirements.php
+++ b/Civi/Install/Requirements.php
@@ -439,7 +439,8 @@ class Requirements {
       'details' => 'MySQL thread_stack is OK',
     );
 
-    $conn = @mysqli_connect($db_config['server'], $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['severity'] = $this::REQUIREMENT_ERROR;
       $results['details'] = 'Could not connect to database';
@@ -480,7 +481,8 @@ class Requirements {
       'details' => 'Can successfully lock and unlock tables',
     );
 
-    $conn = @mysqli_connect($db_config['server'], $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['severity'] = $this::REQUIREMENT_ERROR;
       $results['details'] = 'Could not connect to database';