Fix for search indexing

humhub · May 15, 2024 · 7aafe0d · 7aafe0d
1 parent 24ce2be
commit 7aafe0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.10.3 (Unreleased)
 ------------------------
 - Fix #321: Fix indexing of template content for search
+- Fix #326: Fix for search indexing
 
 1.10.2 (January 8, 2024)
 ------------------------

diff --git a/models/CustomContentContainer.php b/models/CustomContentContainer.php
@@ -44,11 +44,6 @@ abstract class CustomContentContainer extends ContentActiveRecord
     const VISIBILITY_PRIVATE = 0;
     const VISIBILITY_PUBLIC = 1;
 
-    /**
-     * @inheritdoc
-     */
-    public $streamChannel = null;
-
     /**
      * @inheritdoc
      */
@@ -494,11 +489,8 @@ public function beforeSave($insert)
                 break;
         }
 
-        if ($this->checkAbstract() && !$this->admin_only) {
-            $this->streamChannel = 'default';
-        } else {
-            $this->streamChannel = null;
-        }
+        // Keep page hidden on stream when "Abstract" field is not filled, or it is visible only for admin
+        $this->content->hidden = $this->admin_only || !$this->checkAbstract();
 
         return parent::beforeSave($insert);
     }

diff --git a/models/Page.php b/models/Page.php
@@ -176,7 +176,7 @@ public function getSearchAttributes()
             'title' => $this->title,
             'content' => preg_replace('/[\r\n\s]+/', ' ', strip_tags($this->type === TemplateType::ID
                 ? TemplateRenderer::render($this, false, false)
-                : $this->page_content)),
+                : $this->abstract . "\r\n" . $this->page_content)),
         ];
     }