From 5d96fa703d3d9a17b39c910f3f00c6bf60b0363c Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 20 Sep 2014 14:17:14 +0200 Subject: Bug 502625: Replace Email::Send with Email::Sender r=dylan a=glob --- Bugzilla/Config/MTA.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Bugzilla/Config') diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm index ec74b20b3..7be439bf6 100644 --- a/Bugzilla/Config/MTA.pm +++ b/Bugzilla/Config/MTA.pm @@ -12,13 +12,6 @@ use strict; use warnings; use Bugzilla::Config::Common; -# Return::Value 1.666002 pollutes the error log with warnings about this -# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send -# to disable these warnings. -BEGIN { - $Return::Value::NO_CLUCK = 1; -} -use Email::Send; our $sortkey = 1200; @@ -28,9 +21,7 @@ sub get_param_list { { name => 'mail_delivery_method', type => 's', - # Bugzilla is not ready yet to send mails to newsgroups, and 'IO' - # is of no use for now as we already have our own 'Test' mode. - choices => [grep {$_ ne 'NNTP' && $_ ne 'IO'} Email::Send->new()->all_mailers(), 'None'], + choices => ['Sendmail', 'SMTP', 'Test', 'None'], default => 'Sendmail', checker => \&check_mail_delivery_method }, -- cgit v1.2.3-24-g4f1b