From b7fbcf61cf1267564edaf343833fa15f1a806430 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 23 Apr 2010 18:01:40 +0200
Subject: Bug 561362: Remove the 'sendmailnow' parameter r=justdave a=LpSolit

---
 Bugzilla/Config/MTA.pm | 6 ------
 Bugzilla/Mailer.pm     | 2 --
 2 files changed, 8 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index b1e3ab1a4..c90e5dc76 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -64,12 +64,6 @@ sub get_param_list {
    checker => \&check_theschwartz_available,
   },
 
-  {
-   name => 'sendmailnow',
-   type => 'b',
-   default => 1
-  },
-
   {
    name => 'smtpserver',
    type => 't',
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index fb9c5a7ca..596e8ab65 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -145,8 +145,6 @@ sub MessageToMTA {
                 push(@args, "-f$from_email") if $from_email;
             }
         }
-        push(@args, "-ODeliveryMode=deferred")
-            if !Bugzilla->params->{"sendmailnow"};
     }
     else {
         # Sendmail will automatically append our hostname to the From
-- 
cgit v1.2.3-24-g4f1b