holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle php-warning for attachmentobjects not set properly

Browse Source
This commit is contained in:
Klaus Leithoff 2013-12-20 13:25:11 +00:00
parent ae2049db28
commit d302d78435
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_bo.inc.php
View File

@ -4678,12 +4678,12 @@ class mail_bo
$this->fetchPartContents($_uid, $attachment, $_stream); $this->fetchPartContents($_uid, $attachment, $_stream);
} }
// set name as filename, if not set // set name as filename, if not set
if (!$attachment->getDispositionParameter('filename')) if ($attachment && !$attachment->getDispositionParameter('filename'))
{ {
$attachment->setDispositionParameter('filename', $attachment->getName()); $attachment->setDispositionParameter('filename', $attachment->getName());
} }
// guess type, if not set // guess type, if not set
if ($attachment->getType() == 'application/octet-stream') if ($attachment && $attachment->getType() == 'application/octet-stream')
{ {
$attachment->setType(mime_magic::filename2mime($attachment->getDispositionParameter('filename'))); $attachment->setType(mime_magic::filename2mime($attachment->getDispositionParameter('filename')));
} }