gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 28803: (20.11.x) Add invalid email handling in _send_message_by_email 

Quickfix version for 20.11.x because of missing dependancies.
Based on Bug 28996.

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Didier Gautheron 2021-09-24 16:42:38 +02:00 committed by Fridolin Somers
parent 2712dbeca6
commit c8a36a1b95
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C4/Letters.pm
View File

@ -342,6 +342,7 @@ sub SendAlerts {
) or return;
# FIXME: This 'default' behaviour should be moved to Koha::Email
my $success = try {
my $mail = Koha::Email->create(
{
to => $email,
@ -359,7 +360,6 @@ sub SendAlerts {
$mail->text_body( $letter->{content} );
}
my $success = try {
$mail->send_or_die({ transport => $library->smtp_server->transport });
}
catch {
@ -493,6 +493,7 @@ sub SendAlerts {
# ... then send mail
my $library = Koha::Libraries->find( $userenv->{branch} );
my $success = try {
my $mail = Koha::Email->create(
{
to => join( ',', @email ),
@ -519,7 +520,6 @@ sub SendAlerts {
$mail->text_body( "" . $letter->{content} );
}
my $success = try {
$mail->send_or_die({ transport => $library->smtp_server->transport });
}
catch {
@ -1359,6 +1359,7 @@ sub _send_message_by_email {
$branch_returnpath = $library->branchreturnpath;
}
try {
my $email = Koha::Email->create(
{
to => $to_address,
@ -1406,7 +1407,6 @@ sub _send_message_by_email {
if !$message->{to_address}
|| $message->{to_address} ne $email->email->header('To');
try {
$email->send_or_die({ transport => $smtp_server->transport });
_set_message_status(