1 files changed, 19 insertions, 11 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 008aea595..e23bc7622 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -344,6 +344,24 @@ sub send_email {
     my $extra_stash_values = shift || {};
 
     my $sender = $c->config->{DO_NOT_REPLY_EMAIL};
+    my $email = $c->construct_email($template, $extra_stash_values) or return;
+
+    my $result = 0;
+    try {
+        FixMyStreet::Email::Sender->send($email, { from => $sender });
+        $result = $email;
+    } catch {
+        my $error = $_ || 'unknown error';
+        $c->log->error("$error");
+    };
+    return $result;
+}
+
+sub construct_email {
+    my ($c, $template, $extra_stash_values) = @_;
+    $extra_stash_values //= {};
+
+    my $sender = $c->config->{DO_NOT_REPLY_EMAIL};
     my $sender_name = $c->cobrand->contact_name;
 
     # create the vars to pass to the email template
@@ -378,17 +396,7 @@ sub send_email {
     $data->{_html_} = $html_compiled if $html_compiled;
     $data->{_html_images_} = \@inline_images if @inline_images;
 
-    my $email = mySociety::Locale::in_gb_locale { FixMyStreet::Email::construct_email($data) };
-
-    my $result = 0;
-    try {
-        FixMyStreet::Email::Sender->send($email, { from => $sender });
-        $result = $email;
-    } catch {
-        my $error = $_ || 'unknown error';
-        $c->log->error("$error");
-    };
-    return $result;
+    return mySociety::Locale::in_gb_locale { FixMyStreet::Email::construct_email($data) };
 }
 
 =head2 uri_with