Merge branch 'pluggable-photo-storage'

1 files changed, 8 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index f41702dcf..1884b9f26 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -7,6 +7,7 @@ BEGIN {extends 'Catalyst::Controller'; }
 use JSON::MaybeXS;
 use File::Path;
 use File::Slurp;
+use Try::Tiny;
 use FixMyStreet::App::Model::PhotoSet;
 
 =head1 NAME
@@ -101,8 +102,13 @@ sub upload : Local {
         c => $c,
         data_items => \@items,
     });
-
-    my $fileid = $photoset->data;
+    my $fileid = try {
+        $photoset->data;
+    } catch {
+        $c->log->debug("Photo upload failed.");
+        $c->stash->{photo_error} = _("Photo upload failed.");
+        return undef;
+    };
     my $out;
     if ($c->stash->{photo_error} || !$fileid) {
         $c->res->status(500);