diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2015-08-19 12:40:24 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-08-19 15:25:00 +0100 |
| commit | 36d8eba063fe14a153b7f378fef5853725943c37 (patch) | |
| tree | 350766829c302fa7f52e11631d3aa6cbadb3e7aa /perllib/FixMyStreet/App.pm | |
| parent | 0784bdae637e3d0ca20dc3d66ec50c5d68e489ec (diff) | |
Add default sender to send_email_cron.
Matches send_email, remove unneeded setting of sender in one call, and
add contact name to report sent email.
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 787755a05..013f47a29 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -350,6 +350,13 @@ sub send_email { sub send_email_cron { my ( $c, $params, $env_from, $nomail, $cobrand, $lang_code ) = @_; + my $sender = $c->config->{DO_NOT_REPLY_EMAIL}; + $env_from ||= $sender; + if (!$params->{From}) { + my $sender_name = $cobrand->contact_name; + $params->{From} = [ $sender, _($sender_name) ]; + } + my $first_to; if (ref($params->{To}) eq 'ARRAY') { if (ref($params->{To}[0]) eq 'ARRAY') { |