aboutsummaryrefslogtreecommitdiffstats
path: root/perllib
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-03-06 14:40:02 +0000
committerMatthew Somerville <matthew@mysociety.org>2012-03-06 14:40:02 +0000
commit10a81429e40ca1d2a464de94a63ecade51a79b89 (patch)
tree4dc35d59e6033584cdc1177724213aec655d2cae /perllib
parentd7fb7efe76e06bc42a8d40aa24b6ef6d749e1d65 (diff)
Do the stringify/array in the cobrand, for future time when we need multiple results in a cobrand.
Diffstat (limited to 'perllib')
-rw-r--r--perllib/FixMyStreet/App.pm5
-rw-r--r--perllib/FixMyStreet/Cobrand/Base.pm2
2 files changed, 3 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 18cad6b89..0582d88c9 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -151,8 +151,7 @@ sub setup_request {
my $cobrand = $c->cobrand;
# append the cobrand templates to the include path
- $c->stash->{additional_template_paths} =
- [ $cobrand->path_to_web_templates->stringify ]
+ $c->stash->{additional_template_paths} = $cobrand->path_to_web_templates
unless $cobrand->is_default;
# work out which language to use
@@ -411,7 +410,7 @@ call), use this method.
sub render_fragment {
my ($c, $template, $vars) = @_;
- $vars->{additional_template_paths} = [ $c->cobrand->path_to_web_templates->stringify ]
+ $vars->{additional_template_paths} = $c->cobrand->path_to_web_templates
if $vars && !$c->cobrand->is_default;
$c->view('Web')->render($c, $template, $vars);
}
diff --git a/perllib/FixMyStreet/Cobrand/Base.pm b/perllib/FixMyStreet/Cobrand/Base.pm
index 42a891cb4..fada33b78 100644
--- a/perllib/FixMyStreet/Cobrand/Base.pm
+++ b/perllib/FixMyStreet/Cobrand/Base.pm
@@ -62,7 +62,7 @@ Returns the path to the templates for this cobrand - by default
sub path_to_web_templates {
my $self = shift;
- return FixMyStreet->path_to( 'templates/web', $self->moniker );
+ return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify ];
}
1;