File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
lib/internal/Magento/Framework/App Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ protected function _getCacheSettings()
8686 * default cache_dir setting from di.xml when a cache id_prefix is configured in app/etc/env.php.
8787 */
8888 $ cacheInfo = $ this ->deploymentConfig ->getConfigData (FrontendPool::KEY_CACHE );
89- if (null !== $ cacheInfo ) {
89+ if (null !== $ cacheInfo && array_key_exists (FrontendPool:: KEY_FRONTEND_CACHE , $ cacheInfo ) ) {
9090 return array_replace_recursive ($ this ->_frontendSettings , $ cacheInfo [FrontendPool::KEY_FRONTEND_CACHE ]);
9191 }
9292 return $ this ->_frontendSettings ;
Original file line number Diff line number Diff line change @@ -123,6 +123,11 @@ public function initializationParamsDataProvider(): array
123123 [Pool::DEFAULT_FRONTEND_ID => ['default_option ' => 'default_value ' ]],
124124 ['default_option ' => 'default_value ' ]
125125 ],
126+ 'deployment config, default settings but no frontend cache ' => [
127+ [],
128+ [Pool::DEFAULT_FRONTEND_ID => ['default_option ' => 'default_value ' ]],
129+ ['default_option ' => 'default_value ' ]
130+ ],
126131 'deployment config, default settings ' => [
127132 ['frontend ' => [Pool::DEFAULT_FRONTEND_ID => ['configured_option ' => 'configured_value ' ]]],
128133 [Pool::DEFAULT_FRONTEND_ID => ['default_option ' => 'default_value ' ]],
You can’t perform that action at this time.
0 commit comments