From 6a7dae30238051ba6a93da24c5aa601dd8782cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Goetz?= Date: Wed, 6 Jun 2018 23:37:26 +0200 Subject: [PATCH] Fix regression introduced to fix #55 --- global.json | 2 ++ libs/Config.php | 2 +- libs/Tree/Content.php | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 11a04a9..956f7d8 100755 --- a/global.json +++ b/global.json @@ -8,6 +8,8 @@ "image": "", "languages": {}, + "cache": true, + "format": "html", "processor": "", diff --git a/libs/Config.php b/libs/Config.php index 0d2f438..31b5a22 100644 --- a/libs/Config.php +++ b/libs/Config.php @@ -127,7 +127,7 @@ class Config extends BaseConfig return $this['cache']; } - return true; + return false; } public function getCacheKey() diff --git a/libs/Tree/Content.php b/libs/Tree/Content.php index 1d9a128..7259e16 100644 --- a/libs/Tree/Content.php +++ b/libs/Tree/Content.php @@ -121,9 +121,7 @@ class Content extends ContentAbstract $document = $this->getFrontMatter(); $this->attributes = array_replace_recursive($this->attributes, $document->getData()); - if (!$this->manuallySetContent) { - $this->content = $document->getContent(); - } + $this->content = $document->getContent(); } public function setAttributes(array $attributes)