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

Try to get mime data before hashing (cpu intensive)

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-02-25 22:31:45 +01:00
parent bac37d1714
commit 4d17d95335
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Oembed/OembedPlugin.php
View File

@ -325,8 +325,10 @@ class OembedPlugin extends Plugin
throw new UnsupportedMediaException(_('Image file had impossible geometry (0 width or height)'));
}
$ext = File::guessMimeExtension($info['mime']);
// We'll trust sha256 (File::FILEHASH_ALG) not to have collision issues any time soon :)
$filename = hash(File::FILEHASH_ALG, $imgData) . '.' . common_supported_mime_to_ext($info['mime']);
$filename = hash(File::FILEHASH_ALG, $imgData) . ".{$ext}";
$fullpath = File_thumbnail::path($filename);
// Write the file to disk. Throw Exception on failure
if (!file_exists($fullpath) && file_put_contents($fullpath, $imgData) === false) {