[Koha-patches] [PATCH] Stop generation of unnecessary warning messages to log over undef values
Colin Campbell
colin.campbell at ptfs-europe.com
Wed Jul 22 19:07:30 CEST 2009
---
C4/Letters.pm | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/C4/Letters.pm b/C4/Letters.pm
index f3ba145..533dcb5 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -400,18 +400,26 @@ sub SendAlerts {
# ... then send mail
if ( $databookseller->{bookselleremail}
- || $databookseller->{contemail} )
- {
+ || $databookseller->{contemail} ) {
+ my $mail_to = $databookseller->{bookselleremail};
+ if ($databookseller->{contemail}) {
+ if (!$mail_to) {
+ $mail_to = $databookseller->{contemail};
+ } else {
+ $mail_to .= q|,|;
+ $mail_to .= $databookseller->{contemail};
+ }
+ }
+ my $mail_subj = $innerletter->{title};
+ my $mail_msg = $innerletter->{content};
+ $mail_msg ||= q{};
+ $mail_subj ||= q{};
+
my %mail = (
- To => $databookseller->{bookselleremail}
- . (
- $databookseller->{contemail}
- ? "," . $databookseller->{contemail}
- : ""
- ),
+ To => $mail_to,
From => $userenv->{emailaddress},
- Subject => "" . $innerletter->{title},
- Message => "" . $innerletter->{content},
+ Subject => $mail_subj,
+ Message => $mail_msg,
'Content-Type' => 'text/plain; charset="utf8"',
);
sendmail(%mail);
--
1.6.2.5
More information about the Koha-patches
mailing list