Merge branch '1070-dmarc-workaround'

3 files changed, 3 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
index dde30b59c..e59011ba9 100644
--- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
@@ -241,15 +241,13 @@ sub _send_aggregated_alert_email(%) {
 
     my $template = FixMyStreet->get_email_template($cobrand->moniker, $data{lang}, "$data{template}.txt");
 
-    my $sender = FixMyStreet->config('DO_NOT_REPLY_EMAIL');
     my $result = FixMyStreet::App->send_email_cron(
         {
             _template_ => $template,
             _parameters_ => \%data,
-            From => [ $sender, _($cobrand->contact_name) ],
             To => $data{alert_email},
         },
-        $sender,
+        undef,
         0,
         $cobrand,
         $data{lang}
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 8f0d23080..f01ddfff1 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -515,7 +515,7 @@ sub _send_report_sent_email {
             _template_ => $template,
             _parameters_ => $h,
             To => $row->user->email,
-            From => mySociety::Config::get('CONTACT_EMAIL'),
+            From => [ mySociety::Config::get('CONTACT_EMAIL'), $cobrand->contact_name ],
         },
         mySociety::Config::get('CONTACT_EMAIL'),
         $nomail,
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
index 1b89b2e65..db4b6e23e 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
@@ -84,9 +84,6 @@ sub send_questionnaires_period {
         } );
         $h{url} = $cobrand->base_url($row->cobrand_data) . '/Q/' . $token->token;
 
-        my $sender = FixMyStreet->config('DO_NOT_REPLY_EMAIL');
-        my $sender_name = _($cobrand->contact_name);
-
         print "Sending questionnaire " . $questionnaire->id . ", problem "
             . $row->id . ", token " . $token->token . " to "
             . $row->user->email . "\n"
@@ -97,9 +94,8 @@ sub send_questionnaires_period {
                 _template_ => $template,
                 _parameters_ => \%h,
                 To => [ [ $row->user->email, $row->name ] ],
-                From => [ $sender, $sender_name ],
             },
-            $sender,
+            undef,
             $params->{nomail},
             $cobrand
         );