IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #1877

Browse Source
This commit is contained in:
James Cole 2018-11-21 06:08:14 +01:00
parent 56a92505bd
commit e18f843a57
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Support/Search/Modifier.php
View File

@ -171,11 +171,11 @@ class Modifier
{ {
$journalBudget = ''; $journalBudget = '';
if (null !== $transaction->transaction_journal_budget_name) { if (null !== $transaction->transaction_journal_budget_name) {
$journalBudget = app('steam')->decrypt((int)$transaction->transaction_journal_budget_encrypted, $transaction->transaction_journal_budget_name); $journalBudget = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name);
} }
$transactionBudget = ''; $transactionBudget = '';
if (null !== $transaction->transaction_budget_name) { if (null !== $transaction->transaction_budget_name) {
$journalBudget = app('steam')->decrypt((int)$transaction->transaction_budget_encrypted, $transaction->transaction_budget_name); $journalBudget = app('steam')->tryDecrypt($transaction->transaction_budget_name);
} }
return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search); return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search);
@ -191,13 +191,11 @@ class Modifier
{ {
$journalCategory = ''; $journalCategory = '';
if (null !== $transaction->transaction_journal_category_name) { if (null !== $transaction->transaction_journal_category_name) {
$journalCategory = app('steam')->decrypt( $journalCategory = app('steam')->tryDecrypt($transaction->transaction_journal_category_name);
(int)$transaction->transaction_journal_category_encrypted, $transaction->transaction_journal_category_name
);
} }
$transactionCategory = ''; $transactionCategory = '';
if (null !== $transaction->transaction_category_name) { if (null !== $transaction->transaction_category_name) {
$journalCategory = app('steam')->decrypt((int)$transaction->transaction_category_encrypted, $transaction->transaction_category_name); $journalCategory = app('steam')->tryDecrypt($transaction->transaction_category_name);
} }
return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search); return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search);