Merge branch '1146-social-login'

Conflicts:
	templates/web/base/report/new/fill_in_details_form.html
	templates/web/base/report/update-form.html

1 files changed, 2 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/FakeMapit.pm b/perllib/FixMyStreet/App/Controller/FakeMapit.pm
index 253c75ba4..a4adadd09 100755
--- a/perllib/FixMyStreet/App/Controller/FakeMapit.pm
+++ b/perllib/FixMyStreet/App/Controller/FakeMapit.pm
@@ -1,6 +1,7 @@
 package FixMyStreet::App::Controller::FakeMapit;
 use Moose;
 use namespace::autoclean;
+use JSON::MaybeXS;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
@@ -22,7 +23,7 @@ my $area = { "name" => "Everywhere", "type" => "ZZZ", "id" => 161 };
 
 sub output : Private {
     my ( $self, $c, $data ) = @_;
-    my $body = JSON->new->utf8(1)->encode( $data );
+    my $body = encode_json($data);
     $c->res->content_type('application/json; charset=utf-8');
     $c->res->body( $body );
 }