diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2016-01-27 10:34:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-01-27 10:34:55 +0000 |
| commit | b8083a462aebf542f6f39c4201e1f09248b7e0e7 (patch) | |
| tree | ab44be742664db2dd720efc03326db0acef22dde /perllib/FixMyStreet/App/Controller/Report.pm | |
| parent | ac59f93b2228f5ff77ca7b7aff6fc3be54d360cd (diff) | |
| parent | 5adabce92647a6b9e12887af7959efcfef4877d4 (diff) | |
Merge branch '1146-social-login'
Conflicts:
templates/web/base/report/new/fill_in_details_form.html
templates/web/base/report/update-form.html
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Report.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index d7cae05d4..5cc44bb8f 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -2,6 +2,8 @@ package FixMyStreet::App::Controller::Report; use Moose; use namespace::autoclean; +use JSON::MaybeXS; + BEGIN { extends 'Catalyst::Controller'; } =head1 NAME @@ -184,7 +186,7 @@ sub format_problem_for_display : Private { if ( $c->stash->{ajax} ) { $c->res->content_type('application/json; charset=utf-8'); - my $content = JSON->new->utf8(1)->encode( + my $content = encode_json( { report => $c->cobrand->problem_as_hashref( $problem, $c ), updates => $c->cobrand->updates_as_hashref( $problem, $c ), |