Commit d580d6c8 authored by Andreas Fernandez's avatar Andreas Fernandez Committed by Nicole Cordes
Browse files

[BUGFIX] Respect cached page config

On a cached page, initialise the page config only if it does not exist
yet. Merge the cached config with the template config to get the same
array as on a uncached page.

Releases: master, 6.2
Resolves: #66605
Change-Id: Idee4682cbfe5a8fb5f9522fc2f09e1c9bdb81396
Reviewed-on: http://review.typo3.org/38958


Reviewed-by: Markus Klein's avatarMarkus Klein <markus.klein@typo3.org>
Reviewed-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Reviewed-by: default avatarSusanne Moog <typo3@susannemoog.de>
Tested-by: default avatarSusanne Moog <typo3@susannemoog.de>
parent 4707426f
......@@ -2493,9 +2493,12 @@ class TypoScriptFrontendController {
throw new ServiceUnavailableException($message . ' ' . $explanation, 1294587217);
}
} else {
$this->config['config'] = array();
if (!isset($this->config['config'])) {
$this->config['config'] = array();
}
// Filling the config-array, first with the main "config." part
if (is_array($this->tmpl->setup['config.'])) {
ArrayUtility::mergeRecursiveWithOverrule($this->tmpl->setup['config.'], $this->config['config']);
$this->config['config'] = $this->tmpl->setup['config.'];
}
// override it with the page/type-specific "config."
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment