diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2015-08-19 16:51:30 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2015-08-19 16:51:30 +0100 |
| commit | 1e772950bf8011078538ea2921d03fe0af6b1c66 (patch) | |
| tree | d267761e8f7726b151e15f65a0dfc1673bc80757 /perllib/FixMyStreet/App.pm | |
| parent | 114cd8afdc3b108f6685d1973b3d7baf118971bb (diff) | |
| parent | d9f5d6805f8d897e81e00208ab138bada05f8e9d (diff) | |
Merge branch '1070-dmarc-workaround'
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') { |