Move site_title function to site-name web template

This matches the email template behaviour, and makes it much easier to
override without requiring a cobrand package file.

Fixes #979.

1 files changed, 4 insertions, 4 deletions

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index fd70ffda8..769a6bb8f 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -12,6 +12,7 @@ use Memcached;
 use mySociety::Email;
 use mySociety::Random qw(random_bytes);
 use FixMyStreet::Map;
+use Utils;
 
 use Path::Class;
 use URI;
@@ -388,10 +389,9 @@ sub send_email_cron {
     $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;
+    $tt->process( 'site-name.txt', $params, \$site_name );
+    $site_name = Utils::trim_text(Encode::decode('utf8', $site_name));
+    $params->{_parameters_}->{site_name} = $site_name;
 
     $params->{_line_indent} = '';
     my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) };