kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1509

Browse Source
This commit is contained in:
James Cole
2018-06-24 13:46:34 +02:00
parent 72cca5ccbf
commit e05664f34f
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Support/Preferences.php
View File

@@ -163,14 +163,17 @@ class Preferences
{
$lastActivity = microtime();
$preference = $this->get('lastActivity', microtime());
if (null !== $preference && null !== $preference->data) {
$lastActivity = $preference->data;
}
if (\is_array($lastActivity)) {
$lastActivity = implode(',', $lastActivity);
}
$hash = md5($lastActivity);
Log::debug(sprintf('Value of last activity is %s, hash is %s', $lastActivity, $hash));
return md5($lastActivity);
return $hash;
}
/**

1
app/Support/Twig/Journal.php
View File

@@ -198,6 +198,7 @@ class Journal extends Twig_Extension
->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('categories.user_id', $journal->user_id)
->where('transaction_journals.id', $journal->id)
->whereNull('transactions.deleted_at')
->get(['categories.*']);
/** @var Category $category */
foreach ($set as $category) {