diff options
author | Matthew Somerville <matthew@mysociety.org> | 2019-11-27 20:15:33 +0000 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2019-12-09 09:38:03 +0000 |
commit | 2e9e82dfb57b972d1351ecef86687a0d067598b1 (patch) | |
tree | 189119d0c2be5b0327855609d27cb745a3d14d7b /perllib/FixMyStreet/App.pm | |
parent | 6c2d3d5a7d84521d34daa2cf7e4be76a54b3b0e0 (diff) |
Switch to default-escaped in email templates.
We add a way to process a template with no auto-escaping, that can be
used for the text parts of emails, and mark various HTML output as safe.
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
-rw-r--r-- | perllib/FixMyStreet/App.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index f62deae3a..5f0518920 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -371,8 +371,8 @@ sub construct_email { %$extra_stash_values, additional_template_paths => \@include_path, }; - $vars->{site_name} = Utils::trim_text($c->view('Email')->render($c, 'site-name.txt', $vars)); - $vars->{signature} = $c->view('Email')->render($c, 'signature.txt', $vars); + $vars->{site_name} = Utils::trim_text($c->view('EmailText')->render($c, 'site-name.txt', $vars)); + $vars->{signature} = $c->view('EmailText')->render($c, 'signature.txt', $vars); return if FixMyStreet::Email::is_abuser($c->model('DB')->schema, $vars->{to}); @@ -386,7 +386,7 @@ sub construct_email { $c->log->debug("Error compiling HTML $template: $@") if $@; my $data = { - _body_ => $c->view('Email')->render( $c, $template, $vars ), + _body_ => $c->view('EmailText')->render( $c, $template, $vars ), _attachments_ => $extra_stash_values->{attachments}, From => $vars->{from}, To => $vars->{to}, |