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

c6a7c77b · Hugh Davenport · Gerrit Code Review · cda6ff9a · c61c4423 · c6a7c77b
Commit c6a7c77b authored May 16, 2012 by Hugh Davenport Committed by Gerrit Code Review May 16, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

htdocs/thumb.php htdocs/thumb.php +3 -3

No files found.
--- a/htdocs/thumb.php
+++ b/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
+}