diff --git a/CHANGELOG.md b/CHANGELOG.md index f8b319f0..8883dd26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # nystudio107/devmode Change Log +## 2.6.2 - 2022.04.15 +### Changed +* Remove `enableLogging` and `enableProfiling` from `config/db.php` as they've now gone away +* Changed `bootstrap.php` to allow `.env`-set environment variables override existing injected environment variables ([#82](https://github.com/craftcms/craft/issues/82)) + ## 2.6.1 - 2022.04.13 ### Added * Added Craft CMS 4 db dump diff --git a/cms/bootstrap.php b/cms/bootstrap.php index 812b8e3a..bfc971a9 100644 --- a/cms/bootstrap.php +++ b/cms/bootstrap.php @@ -12,7 +12,7 @@ // Load dotenv? if (class_exists('Dotenv\Dotenv')) { - Dotenv\Dotenv::createUnsafeImmutable(CRAFT_BASE_PATH)->safeLoad(); + Dotenv\Dotenv::createUnsafeMutable(CRAFT_BASE_PATH)->safeLoad(); } // Define additional PHP constants diff --git a/cms/config/db.php b/cms/config/db.php index 882f079f..dd258824 100644 --- a/cms/config/db.php +++ b/cms/config/db.php @@ -20,6 +20,4 @@ 'password' => App::env('DB_PASSWORD'), 'schema' => App::env('DB_SCHEMA'), 'tablePrefix' => App::env('DB_TABLE_PREFIX'), - 'enableLogging' => false, - 'enableProfiling' => (bool)App::env('DEV_MODE'), ];