Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst

1 files changed, 1 insertions, 15 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 4c7d7438a..1f1086c21 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -90,20 +90,6 @@ sub path_to_web_templates {
     return FixMyStreet->path_to( 'templates/web', $self->moniker );
 }
 
-=head2 path_to_email_templates
-
-    $path = $cobrand->path_to_email_templates(  );
-
-Returns the path to the templates for this cobrand - by default
-"templates/email/$moniker"
-
-=cut
-
-sub path_to_email_templates {
-    my $self = shift;
-    return FixMyStreet->path_to( 'templates/email', $self->moniker );
-}
-
 =head1 site_restriction
 
 Return a site restriction clause and a site key if the cobrand uses a subset of
@@ -625,7 +611,7 @@ sub email_host {
     my $cobrand_moniker_uc = uc( $self->moniker );
 
     my $email_vhost =
-         mySociety::Config::get("EMAIL_VHOST_$cobrand_moniker_uc")
+         mySociety::Config::get("EMAIL_VHOST_$cobrand_moniker_uc", '')
       || mySociety::Config::get("EMAIL_VHOST")
       || '';