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

MediaFile::fromUpload handles missing local file better

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-05 12:05:12 +01:00
parent 1db02d7f36
commit 7ca0ff9a19
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/mediafile.php
View File

@ -34,8 +34,6 @@ if (!defined('GNUSOCIAL')) { exit(1); }
class MediaFile class MediaFile
{ {
protected $scoped = null;
var $filename = null; var $filename = null;
var $fileRecord = null; var $fileRecord = null;
var $fileurl = null; var $fileurl = null;
@ -236,7 +234,20 @@ class MediaFile
try { try {
$file = File::getByHash($filehash); $file = File::getByHash($filehash);
// If no exception is thrown the file exists locally, so we'll use that and just add redirections. // If no exception is thrown the file exists locally, so we'll use that and just add redirections.
$filename = $file->filename; // but if the _actual_ locally stored file doesn't exist, getPath will throw FileNotFoundException
$filename = basename($file->getPath());
$mimetype = $file->mimetype;
} catch (FileNotFoundException $e) {
// The file does not exist in our local filesystem, so store this upload.
if (!move_uploaded_file($_FILES[$param]['tmp_name'], $e->path)) {
// TRANS: Client exception thrown when a file upload operation fails because the file could
// TRANS: not be moved from the temporary folder to the permanent file location.
throw new ClientException(_('File could not be moved to destination directory.'));
}
$filename = basename($file->getPath());
$mimetype = $file->mimetype; $mimetype = $file->mimetype;
} catch (NoResultException $e) { } catch (NoResultException $e) {