Fixes typo causing the message not to be displayed

[bookstack] / app / Entity.php

diff --git a/app/Entity.php b/app/Entity.php
index 8a15b5aa4d85a94c75d40e447248de1312eafb14..e8deddf0a56f6f861e31ee83523ccac9c47c1bdc 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -4,6 +4,8 @@
 class Entity extends Ownable
 {
 
 class Entity extends Ownable
 {
 

+    protected $fieldsToSearch = ['name', 'description'];
+

     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.
     /**
      * Compares this entity to another given entity.
      * Matches by comparing class and id.


@@ -157,7 +159,7 @@ class Entity extends Ownable
      * @param string[] array $wheres
      * @return mixed
      */
      * @param string[] array $wheres
      * @return mixed
      */

-    public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
+    public function fullTextSearchQuery($terms, $wheres = [])

     {
         $exactTerms = [];
         $fuzzyTerms = [];
     {
         $exactTerms = [];
         $fuzzyTerms = [];


@@ -175,21 +177,22 @@ class Entity extends Ownable
             }
         }
 
             }
         }
 

-        $isFuzzy = count($exactTerms) === 0 || count($fuzzyTerms) > 0;
+        $isFuzzy = count($exactTerms) === 0 && count($fuzzyTerms) > 0;
+

 
         // Perform fulltext search if relevant terms exist.
         if ($isFuzzy) {
             $termString = implode(' ', $fuzzyTerms);
 
         // Perform fulltext search if relevant terms exist.
         if ($isFuzzy) {
             $termString = implode(' ', $fuzzyTerms);

-            $fields = implode(',', $fieldsToSearch);
+            $fields = implode(',', $this->fieldsToSearch);

             $search = $search->selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
             $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
         }
 
         // Ensure at least one exact term matches if in search
         if (count($exactTerms) > 0) {
             $search = $search->selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
             $search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
         }
 
         // Ensure at least one exact term matches if in search
         if (count($exactTerms) > 0) {

-            $search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
+            $search = $search->where(function ($query) use ($exactTerms) {

                 foreach ($exactTerms as $exactTerm) {
                 foreach ($exactTerms as $exactTerm) {

-                    foreach ($fieldsToSearch as $field) {
+                    foreach ($this->fieldsToSearch as $field) {

                         $query->orWhere($field, 'like', $exactTerm);
                     }
                 }
                         $query->orWhere($field, 'like', $exactTerm);
                     }
                 }