aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/Controller/Admin.pm
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2017-11-06 15:33:43 +0000
committerStruan Donald <struan@exo.org.uk>2017-11-07 12:15:29 +0000
commit9d50dcb1c8947d269df2af3616b9f012dbe63c3e (patch)
tree230ccad7c325b32b4072e93b7d546305d0c65529 /perllib/FixMyStreet/App/Controller/Admin.pm
parenta26652ec2383d81eb9649e9d5b90485e574ccd55 (diff)
do not override template when displaying body contacts as text
move setting the body template to before `fetch_contacts` so it doesn't override setting the text only email address template. Fixes #1895
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')
-rw-r--r--perllib/FixMyStreet/App/Controller/Admin.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 453ebed82..05953974e 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -608,9 +608,12 @@ sub edit_body : Chained('body') : PathPart('') : Args(0) {
$c->set_param('posted', '');
$c->forward('fetch_translations');
- $c->forward('fetch_contacts');
+ # don't set this last as fetch_contacts might over-ride it
+ # to display email addresses as text
$c->stash->{template} = 'admin/body.html';
+ $c->forward('fetch_contacts');
+
return 1;
}