3 files changed, 12 insertions, 17 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index 3dc1275f0..9b828f894 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -35,8 +35,7 @@ sub index :Path :Args(0) {
     my $photo;
 
     if ( $comment ) {
-        # FIXME implement comment photos
-        return;
+        $photo = $c->model('DB::Comment')->find( {id => $comment, state => 'confirmed' } );
     } else {
         $photo = $c->model('DB::Problem')->find( {id => $id, state => 'confirmed' } );
     }
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index ff4bb080c..ff471d7cd 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -200,7 +200,6 @@ sub format_problem_for_display : Private {
     $c->stash->{email} = $c->req->param('rznvy');
 
     $c->forward('generate_map_tags');
-    $c->forward('generate_problem_photo');
     $c->forward('generate_problem_meta');
 
     #         problem_updates => Page::display_problem_updates($input{id}, $q),
@@ -243,20 +242,6 @@ sub generate_map_tags : Private {
       return 1;
 }
 
-sub generate_problem_photo : Private {
-    my ( $self, $c ) = @_;
-
-    my $problem = $c->stash->{problem};
-
-    if ( $c->cobrand->allow_photo_display and $problem->photo ) {
-        my $photo = {};
-        ( $photo->{width}, $photo->{height} ) =
-          Image::Size::imgsize( \$problem->photo );
-        $photo->{url} = '/photo/?id=' . $problem->id;
-        $c->stash->{photo} = $photo;
-    }
-}
-
 sub generate_problem_meta : Private {
     my ( $self, $c ) = @_;
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index bac3c5b17..691a4ecc9 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -4,6 +4,8 @@ use Moose;
 use namespace::autoclean;
 BEGIN { extends 'Catalyst::Controller'; }
 
+use Path::Class;
+
 =head1 NAME
 
 FixMyStreet::App::Controller::Report::Update
@@ -68,6 +70,7 @@ sub report_update : Path : Args(0) {
          $c->forward('setup_page')
       && $c->forward('process_user')
       && $c->forward('process_update')
+      && $c->forward('/report/new/process_photo')
       && $c->forward('check_for_errors')
       or $c->go( '/report/display', [ $c->req->param('id') ] );
 
@@ -212,6 +215,14 @@ sub save_update : Private {
             $update->confirm;
     }
 
+    # If there was a photo add that too
+    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);
+    }
+
     if ( $update->in_storage ) {
         $update->update;
     } else {