From e520bd0eb8ac74d8d71769cbab1e6a6435f59dfc Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 14 Jan 2019 13:55:29 -0700
Subject: [PATCH] Fixed environment issue #2284

---
 CHANGELOG.md                            | 1 +
 system/src/Grav/Common/Config/Setup.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c7a22fc9..67d25d5a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 1. [](#improved)
     * Added method argument `Data::filter($missingValuesAsNull)`, defaulting to `false`
 1. [](#bugfix)
+    * Fixed environment getting port added [#2284](https://github.com/getgrav/grav/issues/2284)
     * Fixed `FlexForm::updateObject()` to update array values when they are empty in the form
     
 # v1.6.0-beta.7
diff --git a/system/src/Grav/Common/Config/Setup.php b/system/src/Grav/Common/Config/Setup.php
index 2de7256df..0cb9298ad 100644
--- a/system/src/Grav/Common/Config/Setup.php
+++ b/system/src/Grav/Common/Config/Setup.php
@@ -161,7 +161,7 @@ class Setup extends Data
                 $request = $container['request'];
                 $host = $request->getUri()->getHost();
 
-                static::$environment = $host;
+                static::$environment = Utils::substrToString($host, ':');
             }
         }