diff options
author | Dave Arter <davea@mysociety.org> | 2016-06-15 14:05:42 +0100 |
---|---|---|
committer | Dave Arter <davea@mysociety.org> | 2016-06-15 14:11:07 +0100 |
commit | 986fcfb9917ad32bbbe059d9f8061f806039e5fa (patch) | |
tree | 9705068d4b25ba212d3c93c883ed3f4ffdad0d81 | |
parent | b5b3b8e3cee367a8f82b4179a5d03f4d30e1215e (diff) |
Remove stringify call from template paths
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 6 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/FixMyStreet.pm | 4 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/UKCouncils.pm | 10 | ||||
-rw-r--r-- | perllib/FixMyStreet/Email.pm | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index ee71f583f..76d73d96e 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -27,7 +27,7 @@ Returns the path to the templates for this cobrand - by default sub path_to_web_templates { my $self = shift; my $paths = [ - FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, + FixMyStreet->path_to( 'templates/web', $self->moniker ), ]; return $paths; } @@ -44,8 +44,8 @@ Returns the path to the email templates for this cobrand - by default sub path_to_email_templates { my ( $self, $lang_code ) = @_; my $paths = [ - FixMyStreet->path_to( 'templates', 'email', $self->moniker, $lang_code )->stringify, - FixMyStreet->path_to( 'templates', 'email', $self->moniker )->stringify, + FixMyStreet->path_to( 'templates', 'email', $self->moniker, $lang_code ), + FixMyStreet->path_to( 'templates', 'email', $self->moniker ), ]; return $paths; } diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index d3de9da3a..61011a414 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -7,13 +7,13 @@ use constant COUNCIL_ID_BROMLEY => 2482; sub path_to_web_templates { my $self = shift; return [ - FixMyStreet->path_to( 'templates/web/fixmystreet.com' )->stringify, + FixMyStreet->path_to( 'templates/web/fixmystreet.com' ), ]; } sub path_to_email_templates { my ( $self, $lang_code ) = @_; return [ - FixMyStreet->path_to( 'templates', 'email', 'fixmystreet.com')->stringify, + FixMyStreet->path_to( 'templates', 'email', 'fixmystreet.com'), ]; } diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index d9e8f8673..c8512f852 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -16,17 +16,17 @@ sub is_council { sub path_to_web_templates { my $self = shift; return [ - FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, - FixMyStreet->path_to( 'templates/web/fixmystreet-uk-councils' )->stringify, + FixMyStreet->path_to( 'templates/web', $self->moniker ), + FixMyStreet->path_to( 'templates/web/fixmystreet-uk-councils' ), ]; } sub path_to_email_templates { my ( $self, $lang_code ) = @_; my $paths = [ - FixMyStreet->path_to( 'templates', 'email', $self->moniker, $lang_code )->stringify, - FixMyStreet->path_to( 'templates', 'email', $self->moniker )->stringify, - FixMyStreet->path_to( 'templates', 'email', 'fixmystreet.com')->stringify, + FixMyStreet->path_to( 'templates', 'email', $self->moniker, $lang_code ), + FixMyStreet->path_to( 'templates', 'email', $self->moniker ), + FixMyStreet->path_to( 'templates', 'email', 'fixmystreet.com'), ]; return $paths; } diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm index b12fcfab4..d955f6f72 100644 --- a/perllib/FixMyStreet/Email.pm +++ b/perllib/FixMyStreet/Email.pm @@ -93,7 +93,7 @@ sub send_cron { ); my @include_path = @{ $cobrand->path_to_email_templates($lang_code) }; - push @include_path, FixMyStreet->path_to( 'templates', 'email', 'default' )->stringify; + push @include_path, FixMyStreet->path_to( 'templates', 'email', 'default' ); my $tt = Template->new({ ENCODING => 'utf8', INCLUDE_PATH => \@include_path, |