eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Delete successfully generated thumbnail (temporary sources) too.

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-07-15 12:52:01 +02:00
parent 1d53e7060a
commit 36cfe9f857
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/imagefile.php
View File

@ -151,10 +151,14 @@ class ImageFile
try { try {
$image = new ImageFile($file->getID(), $imgPath); $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 // Avoid deleting the original
try { 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); @unlink($imgPath);
} }
} catch (FileNotFoundException $e) { } catch (FileNotFoundException $e) {
@ -162,7 +166,6 @@ class ImageFile
// doesn't exist anyway, so it's safe to delete $imgPath // doesn't exist anyway, so it's safe to delete $imgPath
@unlink($imgPath); @unlink($imgPath);
} }
throw $e;
} }
return $image; return $image;
} }