diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 2797c931..7dd6df1c 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog 1.10.5 (Unreleased) ---------------------- - Enh #336: Renaming page and snippet to global and space types +- Fix #337: Ignore cache on content search index building 1.10.4 (June 19, 2024) ---------------------- diff --git a/models/Page.php b/models/Page.php index 58390b1e..5d8141ba 100644 --- a/models/Page.php +++ b/models/Page.php @@ -175,7 +175,7 @@ public function getSearchAttributes() return [ 'title' => $this->title, 'content' => preg_replace('/[\r\n\s]+/', ' ', strip_tags($this->type === TemplateType::ID - ? TemplateRenderer::render($this, false, false) + ? TemplateRenderer::render($this, false, false, true) : $this->abstract . "\r\n" . $this->page_content)), ]; } diff --git a/modules/template/components/TemplateRenderer.php b/modules/template/components/TemplateRenderer.php index 840c292d..968b7510 100644 --- a/modules/template/components/TemplateRenderer.php +++ b/modules/template/components/TemplateRenderer.php @@ -12,18 +12,19 @@ class TemplateRenderer * @param $page * @param bool $editMode * @param bool $applyScriptNonce + * @param bool $ignoreCache * @return string * @throws HttpException */ - public static function render($page, $editMode = false, bool $applyScriptNonce = true) + public static function render($page, $editMode = false, bool $applyScriptNonce = true, bool $ignoreCache = false) { $templateInstance = TemplateInstance::findOne(['object_model' => get_class($page) ,'object_id' => $page->id]); - if(!$templateInstance) { + if (!$templateInstance) { throw new HttpException(404, 'Template instance not found!'); } - if(!$editMode && TemplateCache::exists($templateInstance)) { + if (!$ignoreCache && !$editMode && TemplateCache::exists($templateInstance)) { $html = TemplateCache::get($templateInstance); } else { $html = $templateInstance->render($editMode);