kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 00:04:24 +00:00
Code Issues 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
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 */ /** @var \FireflyIII\Repositories\Journal\JournalRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Journal\JournalRepositoryInterface'); $repository = app('FireflyIII\Repositories\Journal\JournalRepositoryInterface');
$journal = $repository->first(); $journal = $repository->first();
if ($journal) { if (!is_null($journal->id)) {
Session::put('first', $journal->date); Session::put('first', $journal->date);
} else { } else {
Session::put('first', Carbon::now()->startOfYear()); 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 public function first(): TransactionJournal
{ {
$entry = $this->user->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']); $entry = $this->user->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
if (is_null($entry)) {
return new TransactionJournal;
}
return $entry; return $entry;
} }