From 7ba57c90d0cf04c1f99d6fc0826fbdb8cf62c7c8 Mon Sep 17 00:00:00 2001
From: Leo Feyer <github@contao.org>
Date: Wed, 25 Sep 2019 22:14:09 +0200
Subject: [PATCH] Fix some minor issues

---
 .gitattributes                                 | 2 +-
 CONTRIBUTORS.md                                | 1 +
 manager-bundle/src/HttpKernel/ContaoKernel.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 1fa55e930d9..a4127596c9d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,6 @@
 /*/src/Resources/contao/languages/*/*.xlf merge=ours
 /*/src/Resources/contao/languages/en/*.xlf merge=text
 
-# Do not the minified theme files
+# Do not merge the minified theme files
 /*/src/Resources/contao/themes/flexible/*.min.css merge=ours
 /*/src/Resources/contao/themes/flexible/*.min.js merge=ours
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f1a8c77d6f3..7ccb18c907b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -65,6 +65,7 @@
  * Mathias Arzberger (MDevster)
  * Defcon0
  * Cédric Morin (Cerdic) 
+ * Simon Reitinger (simonreitinger)
  * Dominik Tomasi (dtomasi)
  * Daniel Jahnsmüller
  * Christian Eggeling
diff --git a/manager-bundle/src/HttpKernel/ContaoKernel.php b/manager-bundle/src/HttpKernel/ContaoKernel.php
index fa2b96dcda1..6540e0dd5e7 100644
--- a/manager-bundle/src/HttpKernel/ContaoKernel.php
+++ b/manager-bundle/src/HttpKernel/ContaoKernel.php
@@ -265,7 +265,7 @@ public static function fromRequest(string $projectDir, Request $request): HttpKe
                 $env = 'dev';
             }
 
-            $_SERVER['APP_ENV'] = $env;
+            $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env;
         }
 
         $kernel = static::create($projectDir, $env);