Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-19 20:31:50 +02:00
Code Issues Packages Projects Releases Activity

ContentBlock: Fixed nested caching detection

Browse Source
This commit is contained in:
Matias Griese
2018-12-11 16:08:58 +02:00
parent bac24cf520
commit 1ba785f28e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
system/src/Grav/Framework/ContentBlock/ContentBlock.php
View File

@@ -29,7 +29,7 @@ class ContentBlock implements ContentBlockInterface
protected $content = '';
protected $blocks = [];
protected $checksum;
protected $cached;
protected $cached = true;
/**
* @param string $id
@@ -139,9 +139,6 @@ class ContentBlock implements ContentBlockInterface
$tokens = [];
$replacements = [];
foreach ($this->blocks as $block) {
if ($block->isCached() === false) {
$this->disableCache();
}
$tokens[] = $block->getToken();
$replacements[] = $block->toString();
}
@@ -188,7 +185,17 @@ class ContentBlock implements ContentBlockInterface
*/
public function isCached()
{
return $this->cached ?? true;
if (!$this->cached) {
return false;
}
foreach ($this->blocks as $block) {
if (!$block->isCached()) {
return false;
}
}
return true;
}
/**