From 3ccde2aa6f7ab81a76fefdb0c7d2d6160767ff75 Mon Sep 17 00:00:00 2001 From: "travis%sedsystems.ca" <> Date: Thu, 10 Mar 2005 01:10:00 +0000 Subject: Bug 284629 : Combine Param(enable_mail_sending) with Param(maildeliverymethod) Patch by Shane H. W. Travis r=Jake a=myk --- Bugzilla/BugMail.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Bugzilla/BugMail.pm') 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"; } -- cgit v1.2.3-24-g4f1b