Merge "Check image file exists in db (bug #992930)"

htdocs/thumb.php

@@ -71,8 +71,8 @@ switch ($type) {
             }
         }
 
-        if ($id) {
-            if ($path = get_dataroot_image_path('artefact/file/profileicons', get_field('artefact_file_files', 'fileid', 'artefact', $id), $size)) {
+        if ($id && $fileid = get_field('artefact_file_files', 'fileid', 'artefact', $id)) {
+            if ($path = get_dataroot_image_path('artefact/file/profileicons', $fileid, $size)) {
                 if ($mimetype) {
                     header('Content-type: ' . $mimetype);
 
@@ -192,4 +192,4 @@ function readfile_exit($path) {
     readfile($path);
     perf_to_log();
     exit;
-}
\ No newline at end of file
+}