aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2016-02-09 14:59:18 +0000
committerMatthew Somerville <matthew@mysociety.org>2016-02-09 14:59:18 +0000
commit6c718aa2e1d3fdbf9f94982a3f95ef5b5495e667 (patch)
treedaa95997ff52c3fdf9313c5893fcfaab8cc781d4 /perllib/FixMyStreet/App
parentc7ddf0cfa97601bfb1da63a977bca68ed3da0583 (diff)
parent9a4b74df50886a5eb79ae53434200b14a1d36a19 (diff)
Merge remote-tracking branch 'mysociety/add-osm-link-to-email'
Diffstat (limited to 'perllib/FixMyStreet/App')
-rw-r--r--perllib/FixMyStreet/App/Controller/Photo.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index df4cab2d8..bfb1c5535 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -4,7 +4,7 @@ use namespace::autoclean;
BEGIN {extends 'Catalyst::Controller'; }
-use JSON;
+use JSON::MaybeXS;
use File::Path;
use File::Slurp;
use FixMyStreet::App::Model::PhotoSet;
@@ -112,9 +112,8 @@ sub upload : Local {
$out = { id => $fileid };
}
- my $body = JSON->new->utf8(1)->encode($out);
$c->res->content_type('application/json; charset=utf-8');
- $c->res->body($body);
+ $c->res->body(encode_json($out));
}
=head2 process_photo