Skip to content

Commit f941cc4

Browse files
committed
Fix appType config being merged incorrectly
1 parent f3e01fa commit f941cc4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

yii2-adapter/bootstrap/bootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
);
117117

118118
$localConfig = Arr::merge(
119-
$app->get('config')->get('craft.app', []),
120-
$app->get('config')->get("app.{$appType}", []),
119+
Arr::except($app->get('config')->get('craft.app', []), $appType),
120+
$app->get('config')->get("craft.app.{$appType}", []),
121121
);
122122

123123
$safeMode = Env::normalizeBooleanValue(Env::get('CRAFT_SAFE_MODE')) ?? $generalConfig->safeMode;

0 commit comments

Comments
 (0)