aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-01-09 22:55:08 +0000
committerMatthew Somerville <matthew@mysociety.org>2015-01-13 16:28:50 +0000
commit676181084d88b0ec94d42521162b4571cb0c0552 (patch)
tree744979e676295aa7daf2de3aa03818b1f6419fb6 /bin
parent4ae8d597a80d91084dcdcd999d480f41a57c70d1 (diff)
Use same handling for cron and non-cron email.
This means that e.g. SMTP authentication is used when set up by all emails, not just non-cron ones. Fixes #988.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/send-comments1
-rwxr-xr-xbin/zurich-overdue-alert5
2 files changed, 1 insertions, 5 deletions
diff --git a/bin/send-comments b/bin/send-comments
index 03adfb095..2192f674c 100755
--- a/bin/send-comments
+++ b/bin/send-comments
@@ -21,7 +21,6 @@ use FixMyStreet::App;
use Utils;
use mySociety::Config;
-use mySociety::EmailUtil;
use Open311;
diff --git a/bin/zurich-overdue-alert b/bin/zurich-overdue-alert
index e7c23b493..c09aef1e2 100755
--- a/bin/zurich-overdue-alert
+++ b/bin/zurich-overdue-alert
@@ -62,16 +62,14 @@ sub send_alert {
admin_url => $cobrand->admin_base_url,
};
- my $env_to = [ $body_email ];
my $to = [ [ $body_email, $body->name ] ];
if ( $include_parent ) {
my $parent = $body->parent;
my $parent_email = $parent->endpoint;
- push @$env_to, $parent_email;
push @$to, [ $parent_email, $parent->name ];
}
- my $result = FixMyStreet::App->send_email_cron(
+ FixMyStreet::App->send_email_cron(
{
_template_ => $template,
_parameters_ => $h,
@@ -79,7 +77,6 @@ sub send_alert {
From => [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ],
},
FixMyStreet->config('CONTACT_EMAIL'),
- $env_to,
$nomail
);
}