From 36cfe9f85774e037b4eeaebc19f9e78d149f7507 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 15 Jul 2016 12:52:01 +0200
Subject: [PATCH] Delete successfully generated thumbnail (temporary sources)
 too.

---
 lib/imagefile.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/imagefile.php b/lib/imagefile.php
index b0cd13089f..626221d9a8 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -151,10 +151,14 @@ class ImageFile
 
         try {
             $image = new ImageFile($file->getID(), $imgPath);
-        } catch (UnsupportedMediaException $e) {
+        } catch (Exception $e) {
+            common_debug(sprintf('Exception caught when creating ImageFile for File id==%s and imgPath==', _ve($file->id), _ve($imgPath)));
+            throw $e;
+        } finally {
             // Avoid deleting the original
             try {
-                if ($imgPath !== $file->getPath()) {
+                if (strlen($imgPath) > 0 && $imgPath !== $file->getPath()) {
+                    common_debug(__METHOD__.': Deleting temporary file that was created as image file thumbnail source: '._ve($imgPath));
                     @unlink($imgPath);
                 }
             } catch (FileNotFoundException $e) {
@@ -162,7 +166,6 @@ class ImageFile
                 // doesn't exist anyway, so it's safe to delete $imgPath
                 @unlink($imgPath);
             }
-            throw $e;
         }
         return $image;
     }