From d23cae97f81c8384875b3a91d8a3d6967f0149dd Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Fri, 17 Apr 2020 20:23:51 +0200
Subject: [PATCH] chore: fix search broken in #3852 (#3855)

---
 app/Http/Controllers/ContactsController.php | 2 +-
 app/Traits/Searchable.php                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index 0ed41b31f..5b80fe037 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -718,7 +718,7 @@ class ContactsController extends Controller
         $perPage = $request->has('perPage') ? $request->input('perPage') : config('monica.number_of_contacts_pagination');
 
         // search contacts
-        $contacts = $contacts->search($request->has('search') ? $request->input('search') : '', $accountId, 'is_starred', 'desc', $sort)
+        $contacts = $contacts->search($request->input('search') ?? '', $accountId, 'is_starred', 'desc', $sort)
             ->paginate($perPage);
 
         return [
diff --git a/app/Traits/Searchable.php b/app/Traits/Searchable.php
index 47f0165c6..db5581c6b 100644
--- a/app/Traits/Searchable.php
+++ b/app/Traits/Searchable.php
@@ -30,7 +30,8 @@ trait Searchable
 
         $queryString = $this->buildQuery($searchableColumns, $needle);
 
-        $builder->whereRaw('('.$queryString.')')
+        $builder->whereRaw(DBHelper::getTable($this->getTable()).".`account_id` = $accountId")
+            ->whereRaw("( $queryString )")
             ->orderBy($orderByColumn, $orderByDirection);
 
         if ($sortOrder) {