Fixes issue when a port number is appended to the hostname, expected: pick the hostname'd config file (without port number)

1 files changed, 9 insertions, 0 deletions

diff --git a/core/Config.php b/core/Config.php
index d08e89ce4c..2e093007c7 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -234,10 +234,19 @@ class Config extends Singleton
         return false;
     }
 
+    /**
+     * Returns the hostname of the current request (without port number)
+     *
+     * @return string
+     */
     public static function getHostname()
     {
         // Check trusted requires config file which is not ready yet
         $host = Url::getHost($checkIfTrusted = false);
+
+        // Remove any port number to get actual hostname
+        $host = Url::getHostSanitized($host);
+
         return $host;
     }