From acc83a0623cc1823ee2367456c1e2bcc52a414f6 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 3 Jan 2020 19:26:00 +0100 Subject: [PATCH] wip #3305 @0.1 --- app/Http/Controllers/AjaxController.php | 8 +------- app/Templates/Search.php | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index c1291e6..86dd4f3 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -1,15 +1,10 @@ q, Locale::getDefaultLocale(), $request->type ?? null, $request->limit ?? null); + return Search::query($request->q, App::getLocale(), $request->type ?? null, $request->limit ?? null); } diff --git a/app/Templates/Search.php b/app/Templates/Search.php index 14bd671..a2fcf60 100644 --- a/app/Templates/Search.php +++ b/app/Templates/Search.php @@ -3,8 +3,8 @@ namespace App\Templates; -use App\Models\Locale; use Cubist\Backpack\app\Magic\Search as SearchEngine; +use Illuminate\Support\Facades\App; class Search extends Base { @@ -36,6 +36,6 @@ class Search extends Base public function setData(&$data) { $request = $data['request']; - $data['results'] = $request->q ? SearchEngine::query($request->q, Locale::getDefaultLocale(), $request->type, $request->limit) : []; + $data['results'] = $request->q ? SearchEngine::query($request->q, App::getLocale(), $request->type, $request->limit) : []; } } -- 2.39.5