From 61ab51096f3ff18ad47c864d1ecd42c7dd7f2dc9 Mon Sep 17 00:00:00 2001
From: William Mortada <william@mortada.co.uk>
Date: Thu, 12 Oct 2017 01:42:44 +0100
Subject: [PATCH] Allow for case when port is blank

---
 install/index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/index.php b/install/index.php
index ebc282eea6..3bc070caf0 100644
--- a/install/index.php
+++ b/install/index.php
@@ -339,8 +339,12 @@ if ($installType == 'drupal') {
     $drupalConfig = $_POST['drupal'];
   }
   else {
+    $dbServer = $databases['default']['default']['host'];
+    if (!empty($databases['default']['default']['port'])) {
+      $dbServer .= ':' . $databases['default']['default']['port'];
+    }
     $drupalConfig = array(
-      "server" => $databases['default']['default']['host'] . ':' . $databases['default']['default']['port'],
+      "server" => $dbServer,
       "username" => $databases['default']['default']['username'],
       "password" => $databases['default']['default']['password'],
       "database" => $databases['default']['default']['database'],
-- 
2.25.1