GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix "Implement a class for automatic temporary file handling"

Browse Source 
TemporaryFile::commit throws instead of returning a bool.
This commit is contained in:
Alexei Sorokin 2020-09-14 20:37:48 +03:00 committed by Diogo Peralta Cordeiro
parent d7e7396d17
commit 160b6ccd94
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/media/mediafile.php
View File

@ -517,7 +517,12 @@ class MediaFile
if ($media === 'image') {
$result = rename($outpath, $filepath);
} else {
$result = $tempfile->commit($filepath);
try {
$tempfile->commit($filepath);
$result = true;
} catch (TemporaryFileException $e) {
$result = false;
}
}
if (!$result) {
// TRANS: Server exception thrown when a file upload operation fails because the file could

7
plugins/FFmpeg/FFmpegPlugin.php
View File

@ -115,7 +115,12 @@ class FFmpegPlugin extends Plugin
}
if ($success) {
$success = $tempfile->commit($outpath);
try {
$tempfile->commit($outpath);
} catch (TemporaryFileException $e) {
$this->log(LOG_ERR, 'Unable to save the GIF image');
$success = false;
}
}
@unlink($palette);