aboutsummaryrefslogtreecommitdiffstats
path: root/perllib
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2018-06-04 14:39:30 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2018-06-04 14:39:30 +0100
commitcbf69359d101c0e5ca6058f84674ef04a3c8632e (patch)
treeffe0eb8b0f3aa5a2ef55e803b9768af152338b7f /perllib
parentc250740e73ee35dba05200458183eaa4215252c0 (diff)
parent19e292fc8b14bca8916c3e9589f2be6b4924f464 (diff)
Merge branch 'issues/commercial/1037-bromley-wording'
Diffstat (limited to 'perllib')
-rw-r--r--perllib/FixMyStreet/App.pm2
-rw-r--r--perllib/FixMyStreet/Cobrand/Bromley.pm2
2 files changed, 4 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 590daa170..82fcce508 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -370,6 +370,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);
return if FixMyStreet::Email::is_abuser($c->model('DB')->schema, $vars->{to});
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 95ed5dc12..5d14d0b01 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -16,6 +16,8 @@ sub base_url {
return 'https://fix.bromley.gov.uk';
}
+sub default_show_name { 0 }
+
sub disambiguate_location {
my $self = shift;
my $string = shift;