This commit is contained in:
Andras Bacsai
2023-10-06 10:47:48 +02:00
parent d32e43ef37
commit 575338609b

View File

@@ -345,7 +345,12 @@ function send_user_an_email(MailMessage $mail, string $email, ?string $cc = null
} }
function isTestEmailEnabled($notifiable) function isTestEmailEnabled($notifiable)
{ {
return data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled'); if (data_get($notifiable, 'use_instance_email_settings') && isInstanceAdmin()) {
return true;
} else if (data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled') && auth()->user()->isAdminFromSession()) {
return true;
}
return false;
} }
function isEmailEnabled($notifiable) function isEmailEnabled($notifiable)
{ {