kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-01 11:31:06 +00:00
Code Issues Projects Releases Wiki Activity

This fixes the tests.

Browse Source
This commit is contained in:
James Cole
2016-12-07 20:45:26 +01:00
parent da3988cc63
commit efe290d96c
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Middleware/IsConfirmed.php
View File

@@ -46,7 +46,12 @@ class IsConfirmed
return redirect()->guest('login');
}
// must the user be confirmed in the first place?
$mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data;
$confirmPreference = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'));
$mustConfirmAccount = false;
if (!is_null($confirmPreference)) {
$mustConfirmAccount = $confirmPreference->data;
}
// user must be logged in, then continue:
$isConfirmed = Preferences::get('user_confirmed', false)->data;