beenull/Pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix $this->config['twig_config'] handling in Pico::loadTheme()

Browse source
This commit is contained in:
Daniel Rudolf 2019-10-20 19:17:42 +02:00
parent 9c00ac4191
commit d2573c5df5
No known key found for this signature in database
GPG key ID: A061F02CD8DE4538
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Pico.php
View file

@ -1083,14 +1083,9 @@ class Pico
// load theme config from pico-theme.yml
$themeConfigFile = $this->getThemesDir() . $this->getTheme() . '/pico-theme.yml';
if (is_file($themeConfigFile)) {
$yamlParser = $this->getYamlParser();
$loadConfigClosure = function ($configFile) use ($yamlParser) {
$yaml = file_get_contents($configFile);
$config = $yamlParser->parse($yaml);
return is_array($config) ? $config : array();
};
$themeConfig = $loadConfigClosure($themeConfigFile);
$themeConfigYaml = file_get_contents($themeConfigFile);
$themeConfig = $this->getYamlParser()->parse($themeConfigYaml);
$themeConfig = is_array($themeConfig) ? $themeConfig : array();
}
$themeConfig += array(
@ -1119,6 +1114,7 @@ class Pico
unset($themeConfig['twig_config']);
$defaultTwigConfig = array('debug' => null, 'cache' => false, 'auto_reload' => null);
$this->config['twig_config'] = is_array($this->config['twig_config']) ? $this->config['twig_config'] : array();
$this->config['twig_config'] = array_merge($defaultTwigConfig, $themeTwigConfig, $this->config['twig_config']);
if ($this->config['twig_config']['autoescape'] === true) {