Merge branch 'develop' into 5.8-dev

This commit is contained in:
James Cole
2022-09-24 07:03:03 +02:00
16 changed files with 331 additions and 305 deletions

View File

@@ -566,6 +566,10 @@ class User extends Authenticatable
if (null !== $pref) {
$email = $pref->data;
}
// if user is demo user, send to owner:
if ($this->hasRole('demo')) {
$email = config('firefly.site_owner');
}
return match ($driver) {
'database' => $this->notifications(),