diff options
author | travis%sedsystems.ca <> | 2005-03-10 02:10:00 +0100 |
---|---|---|
committer | travis%sedsystems.ca <> | 2005-03-10 02:10:00 +0100 |
commit | 3ccde2aa6f7ab81a76fefdb0c7d2d6160767ff75 (patch) | |
tree | 3d2126ae418fdcd8c5cbe76d05852f5aa7a0f9b4 /Bugzilla | |
parent | 56c497393404c0b9077e3050b6c722e41b152c9b (diff) | |
download | bugzilla-3ccde2aa6f7ab81a76fefdb0c7d2d6160767ff75.tar.gz bugzilla-3ccde2aa6f7ab81a76fefdb0c7d2d6160767ff75.tar.xz |
Bug 284629 : Combine Param(enable_mail_sending) with Param(maildeliverymethod)
Patch by Shane H. W. Travis <travis@sedsystems.ca> r=Jake a=myk
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/BugMail.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index a0c11ef20..1221dcfbc 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -883,17 +883,17 @@ sub NewProcessOnePerson ($$$$$$$$$$$$$) { sub MessageToMTA ($) { my ($msg) = (@_); - return unless Param('enable_mail_sending'); + return if (Param('mail_delivery_method') eq "none"); my @args; - if (Param("maildeliverymethod") eq "sendmail" && !Param("sendmailnow")) { + if (Param("mail_delivery_method") eq "sendmail" && !Param("sendmailnow")) { push @args, "-ODeliveryMode=deferred"; } - if (Param("maildeliverymethod") eq "smtp") { + if (Param("mail_delivery_method") eq "smtp") { push @args, Server => Param("smtpserver"); } - my $mailer = new Mail::Mailer Param("maildeliverymethod"), @args; - if (Param("maildeliverymethod") eq "testfile") { + my $mailer = new Mail::Mailer Param("mail_delivery_method"), @args; + if (Param("mail_delivery_method") eq "testfile") { $Mail::Mailer::testfile::config{outfile} = "$datadir/mailer.testfile"; } |