From 6a643dba5ad7e03efee9b61cccdeffaf27851ff2 Mon Sep 17 00:00:00 2001 From: Lisa Kreitz Date: Tue, 4 Jun 2024 19:53:49 +0200 Subject: [PATCH] [BUGFIX] Load env.prod file before server env vars --- config/system/additional.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/system/additional.php b/config/system/additional.php index 423ce35..7a99145 100644 --- a/config/system/additional.php +++ b/config/system/additional.php @@ -3,13 +3,13 @@ $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../', '.env.dist'); $dotenv->load(); -if (file_exists(__DIR__ . '/../../.env')) { - $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../'); +if (\TYPO3\CMS\Core\Core\Environment::getContext() == 'Production') { + $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../', '.env.prod'); $dotenv->load(); } -if (\TYPO3\CMS\Core\Core\Environment::getContext() == 'Production') { - $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../', '.env.prod'); +if (file_exists(__DIR__ . '/../../.env')) { + $dotenv = Dotenv\Dotenv::createMutable(__DIR__ . '/../../'); $dotenv->load(); }