From 1949c72c3c84450a41df9505cdbacd19c3bbe065 Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Fri, 24 Mar 2023 22:19:40 -0400 Subject: [PATCH] Pass CI_ENVIRONMENT via Apache --- docker/apache/000-default.conf | 2 ++ system/CodeIgniter.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/apache/000-default.conf b/docker/apache/000-default.conf index 7b5f392..c2fa79d 100644 --- a/docker/apache/000-default.conf +++ b/docker/apache/000-default.conf @@ -2,6 +2,8 @@ ServerAdmin works@chiefsoft.com ServerName blogdata.mermsemr.com DocumentRoot /var/www/html/public + + PassEnv CI_ENVIRONMENT Options Indexes FollowSymLinks diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index ab06be7..24ad148 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -473,7 +473,6 @@ class CodeIgniter protected function detectEnvironment() { // Make sure ENVIRONMENT isn't already set by other means. - $_SERVER['CI_ENVIRONMENT'] = getenv('CI_ENVIRONMENT'); if (! defined('ENVIRONMENT')) { define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production'); }