Fix some minor issues

contao · Sep 25, 2019 · 7ba57c9 · 7ba57c9
1 parent ca1328d
commit 7ba57c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -65,6 +65,7 @@
  * Mathias Arzberger (MDevster)
  * Defcon0
  * Cédric Morin (Cerdic) 
+ * Simon Reitinger (simonreitinger)
  * Dominik Tomasi (dtomasi)
  * Daniel Jahnsmüller
  * Christian Eggeling

diff --git 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);