Merge remote-tracking branch 'origin/master' into send-report-rewrite

Conflicts:
	bin/send-reports
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 1 insertions, 4 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index f0cb02115..6ed7ddd9d 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -205,10 +205,7 @@ sub submit_standard : Private {
             }
         );
         if ( my $fileid = $c->stash->{upload_fileid} ) {
-            my $file = file( $c->config->{UPLOAD_CACHE}, "$fileid.jpg" );
-            my $blob = $file->slurp;
-            $file->remove;
-            $update->photo($blob);
+            $update->photo( $fileid );
         }
         $update->insert;
     }