aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App.pm
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2014-12-09 18:09:16 +0000
committerMatthew Somerville <matthew-github@dracos.co.uk>2014-12-10 11:51:24 +0000
commitbd09e5d135aff5abdf01f279b6258bc8cb250f8a (patch)
treed5a877714067962c40196fe6e7e9cfef42a08a81 /perllib/FixMyStreet/App.pm
parent819bac8ab6fa16fc260efb953db15c758dbc7109 (diff)
Fix encoding of signature in emails.
This text was being imported encoded, which led to double-encoding when used in templates. Fixes #960 and #961.
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
-rw-r--r--perllib/FixMyStreet/App.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 7922dfea1..4c2b65979 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -380,9 +380,11 @@ sub send_email_cron {
});
my ($sig, $site_name);
$tt->process( 'signature.txt', $params, \$sig );
+ $sig = Encode::decode('utf8', $sig);
$params->{_parameters_}->{signature} = $sig;
$tt->process( 'site_name.txt', $params, \$site_name );
+ $site_name = Encode::decode('utf8', $site_name);
my $site_title = $cobrand ? $cobrand->site_title : '';
$params->{_parameters_}->{site_name} = $site_name || $site_title;