Merge pull request #337 from humhub/fix/310-ignore-cache-search-index

Ignore cache on content search index building
humhub · Jul 15, 2024 · 5314ac0 · 5314ac0
2 parents f906cde + 8c6cbd4
commit 5314ac0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);