Merge branch 'pr-564'

This commit is contained in:
Jan Böhmer 2024-03-11 22:24:26 +01:00
commit c4bc1a4c51

View file

@ -370,8 +370,10 @@ class AttachmentSubmitHandler
//If a content disposition header was set try to extract the filename out of it
if (isset($headers['content-disposition'])) {
$tmp = [];
preg_match('/[^;\\n=]*=([\'\"])*(.*)(?(1)\1|)/', $headers['content-disposition'][0], $tmp);
$filename = $tmp[2];
//Only use the filename if the regex matches properly
if (preg_match('/[^;\\n=]*=([\'\"])*(.*)(?(1)\1|)/', $headers['content-disposition'][0], $tmp)) {
$filename = $tmp[2];
}
}
//If we don't know filename yet, try to determine it out of url