3 files changed, 28 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index 64a4aef93..3dc1275f0 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -4,6 +4,8 @@ use namespace::autoclean;
 
 BEGIN {extends 'Catalyst::Controller'; }
 
+use DateTime::Format::HTTP;
+
 =head1 NAME
 
 FixMyStreet::App::Controller::Photo - Catalyst Controller
@@ -48,7 +50,12 @@ sub index :Path :Args(0) {
         $photo = _resize( $photo, '195x' );
     }
 
-    print $photo;
+    my $dt = DateTime->now();
+    $dt->set_year( $dt->year + 1 );
+
+    $c->res->content_type( 'image/jpeg' );
+    $c->res->header( 'expires', DateTime::Format::HTTP->format_datetime( $dt ) );
+    $c->res->body( $photo );
 }
 
 sub _resize {
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 6eefb30b2..7259087be 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -84,4 +84,17 @@ sub check_for_errors {
 
     return \%errors;
 }
+
+=head2 confirm
+
+Set state of comment to confirmed
+
+=cut
+
+sub confirm {
+    my $self = shift;
+
+    $self->state( 'confirmed' );
+    $self->confirmed( \'ms_current_timestamp()' );
+}
 1;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index b558d0dda..35f934299 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -128,10 +128,13 @@ sub delete_user {
     }
 
     $mech->log_out_ok;
-    ok( $_->delete, "delete comment" . $_->text )    #
-      for $user->comments;
-    ok( $_->delete, "delete problem " . $_->title )    #
-      for $user->problems;
+    for my $p ( $user->problems ) {
+        ok( $_->delete, "delete comment " . $_->text )
+            for $p->comments;
+        ok( $p->delete, "delete problem " . $p->title );
+    }
+    ok( $_->delete, "delete comment " . $_->text )
+        for $user->comments;
     ok( $_->delete, "delete alert " . $_->alert_type )
       for $user->alerts;
     ok $user->delete, "delete test user " . $user->email;