1 files changed, 12 insertions, 11 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index fa4baf045..09afabecf 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -5,7 +5,7 @@ use namespace::autoclean;
 BEGIN {extends 'Catalyst::Controller'; }
 
 use DateTime::Format::HTTP;
-use Digest::SHA1 qw(sha1_hex);
+use Digest::SHA qw(sha1_hex);
 use File::Path;
 use File::Slurp;
 use Path::Class;
@@ -30,17 +30,19 @@ Display a photo
 
 =cut
 
-sub during :LocalRegex('^([0-9a-f]{40})\.temp\.jpeg$') {
+sub during :LocalRegex('^([0-9a-f]{40})\.(temp|fulltemp)\.jpeg$') {
     my ( $self, $c ) = @_;
-    my ( $hash ) = @{ $c->req->captures };
+    my ( $hash, $size ) = @{ $c->req->captures };
 
     my $file = file( $c->config->{UPLOAD_DIR}, "$hash.jpeg" );
     my $photo = $file->slurp;
 
-    if ( $c->cobrand->default_photo_resize ) {
-        $photo = _shrink( $photo, $c->cobrand->default_photo_resize );
-    } else {
-        $photo = _shrink( $photo, '250x250' );
+    if ( $size eq 'temp' ) {
+        if ( $c->cobrand->default_photo_resize ) {
+            $photo = _shrink( $photo, $c->cobrand->default_photo_resize );
+        } else {
+            $photo = _shrink( $photo, '250x250' );
+        }
     }
 
     $c->forward( 'output', [ $photo ] );
@@ -73,7 +75,9 @@ sub index :LocalRegex('^(c/)?(\d+)(?:\.(full|tn|fp))?\.jpeg$') {
 
     $c->detach( 'no_photo' ) unless @photo;
 
-    my $photo = $photo[0]->photo;
+    my $item = $photo[0];
+    $c->detach( 'no_photo' ) unless $c->cobrand->allow_photo_display($item); # Should only be for reports, not updates
+    my $photo = $item->photo;
 
     # If photo field contains a hash
     if (length($photo) == 40) {
@@ -102,10 +106,7 @@ sub output : Private {
     File::Path::make_path( FixMyStreet->path_to( 'web', 'photo', 'c' )->stringify );
     File::Slurp::write_file( FixMyStreet->path_to( 'web', $c->req->path )->stringify, \$photo );
 
-    my $dt = DateTime->now()->add( years => 1 );
-
     $c->res->content_type( 'image/jpeg' );
-    $c->res->header( 'expires', DateTime::Format::HTTP->format_datetime( $dt ) );
     $c->res->body( $photo );
 }