From bb0473577998ff275a3f28b279a74948dc2ef044 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 21 Feb 2017 13:23:35 +0000
Subject: Do not re-stat non-existent files.

The versioning code wasn't remembering when it had found that a file did
not exist, so was checking for them each time.
---
 perllib/FixMyStreet/App/View/Web.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib')

diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index b73fa82ef..496463700 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -155,7 +155,7 @@ sub version {
 
 sub _version_get_mtime {
     my $file = shift;
-    unless ($version_hash{$file} && !FixMyStreet->config('STAGING_SITE')) {
+    unless (defined $version_hash{$file} && !FixMyStreet->config('STAGING_SITE')) {
         my $path = FixMyStreet->path_to('web', $file);
         $version_hash{$file} = ( stat( $path ) )[9] || 0;
     }
-- 
cgit v1.2.3


From 7ecd4513cc9703fa27b1f521a1fc443cc9a3ca33 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 21 Feb 2017 13:24:13 +0000
Subject: Assume photo ID given in database exists on disk.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The list code was checking the photo ID given in the database existed on
disk – this shouldn't ever not be the case, and if it was, all that
would happen would be a broken image when the full photo code looks for
it (this is only for e.g. lists of reports).
---
 perllib/FixMyStreet/App/Model/PhotoSet.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'perllib')

diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 46e1fb630..04521b5ce 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -191,12 +191,7 @@ has ids => ( #  Arrayref of $fileid tuples (always, so post upload/raw data proc
             $type ||= 'jpeg';
             if ($fileid && length($fileid) == 40) {
                 my $file = $self->get_file($fileid, $type);
-                if ($file->exists) {
-                    $file->basename;
-                } else {
-                    warn "File $part doesn't exist";
-                    ();
-                }
+                $file->basename;
             } else {
                 # A bad hash, probably a bot spamming with bad data.
                 ();
-- 
cgit v1.2.3