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 null pointer.

Browse Source
This commit is contained in:
James Cole 2016-04-10 21:31:00 +02:00
parent e893000ce9
commit a9c026884d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/Range.php
View File

@ -69,7 +69,7 @@ class Range
/** @var \FireflyIII\Repositories\Journal\JournalRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Journal\JournalRepositoryInterface');
$journal = $repository->first();
if ($journal) {
if (!is_null($journal->id)) {
Session::put('first', $journal->date);
} else {
Session::put('first', Carbon::now()->startOfYear());

3
app/Repositories/Journal/JournalRepository.php
View File

@ -59,6 +59,9 @@ class JournalRepository implements JournalRepositoryInterface
public function first(): TransactionJournal
{
$entry = $this->user->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
if (is_null($entry)) {
return new TransactionJournal;
}
return $entry;
}