From bbab89d8844d2447ee5f6461aa1cc5fbc7ceb6d6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 16 Sep 2017 06:52:53 +0200 Subject: [PATCH] Fixes #848 --- app/Http/Controllers/SearchController.php | 2 +- resources/lang/en_US/firefly.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 615947e108..596616359b 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -51,7 +51,7 @@ class SearchController extends Controller */ public function index(Request $request, SearchInterface $searcher) { - $fullQuery = $request->get('q'); + $fullQuery = strval($request->get('q')); // parse search terms: $searcher->parseQuery($fullQuery); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 52abc3bff6..35cf398ba9 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -141,6 +141,7 @@ return [ 'search_box_intro' => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.', 'search_error' => 'Error while searching', 'search_searching' => 'Searching ...', + 'search_results' => 'Search results', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', @@ -964,6 +965,7 @@ return [ 'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.', 'import_index_type' => 'Select the type of file you will upload', 'import_index_start' => 'Start importing', + 'import_file' => 'Import a file', // supported file types: 'import_file_type_csv' => 'CSV (comma separated values)',