@@ -, +, @@ --- Koha/Email.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/Koha/Email.pm +++ a/Koha/Email.pm @@ -76,7 +76,11 @@ sub create { my ( $self, $params ) = @_; my $args = {}; - $args->{from} = $params->{from} || C4::Context->preference('KohaAdminEmailAddress'); + $args->{from} = + $params->{sender} + || C4::Context->preference('ReturnpathDefault') + || $params->{from} + || C4::Context->preference('KohaAdminEmailAddress'); Koha::Exceptions::BadParameter->throw( error => "Invalid 'from' parameter: " . $args->{from}, parameter => 'from' @@ -101,9 +105,8 @@ sub create { $addresses->{reply_to} ||= C4::Context->preference('ReplytoDefault') if C4::Context->preference('ReplytoDefault'); - $addresses->{sender} = $params->{sender}; - $addresses->{sender} ||= C4::Context->preference('ReturnpathDefault') - if C4::Context->preference('ReturnpathDefault'); + $addresses->{sender} = + $params->{from} || C4::Context->preference('KohaAdminEmailAddress'); unless ( C4::Context->preference('SendAllEmailsTo') ) { $addresses->{cc} = $params->{cc} --