Merge branch 'fileUploadFix'

This commit is contained in:
brantje 2017-01-11 20:54:38 +01:00
commit e9f07f9800
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -372,7 +372,7 @@ class EncryptService {
$userKey = ''; $userKey = '';
$userSuppliedKey = ''; $userSuppliedKey = '';
if ($file instanceof File) { if ($file instanceof File) {
$userSuppliedKey = $file->getFilename(); $userSuppliedKey = $file->getSize();
$userKey = md5($file->getMimetype()); $userKey = md5($file->getMimetype());
} }