* eMail: check before signaling that mail has an attachment, even for multipart/mixed

This commit is contained in:
Klaus Leithoff 2011-01-27 13:00:43 +00:00
parent bfd0871d18
commit 87297198c0

View File

@ -352,7 +352,7 @@ class uiwidgets
substr($header['mimetype'],0,5) == 'video') substr($header['mimetype'],0,5) == 'video')
{ {
$image = html::image('felamimail','attach'); $image = html::image('felamimail','attach');
if ($header['mimetype'] != 'multipart/mixed' && if (//$header['mimetype'] != 'multipart/mixed' &&
$header['mimetype'] != 'multipart/signed' $header['mimetype'] != 'multipart/signed'
) )
{ {
@ -683,7 +683,7 @@ class uiwidgets
$image = "<a name=\"subject_url\" href=\"#\" $image = "<a name=\"subject_url\" href=\"#\"
onclick=\"fm_readAttachments('".$GLOBALS['egw']->link('/index.php',$linkDataAttachments)."', '".$windowName."', this); return false;\" onclick=\"fm_readAttachments('".$GLOBALS['egw']->link('/index.php',$linkDataAttachments)."', '".$windowName."', this); return false;\"
title=\"".$headerData['subject']."\">".$image."</a>"; title=\"".$headerData['subject']."\">".$image."</a>";
if ($headerData['mimetype'] != 'multipart/mixed' && if (//$headerData['mimetype'] != 'multipart/mixed' &&
$header['mimetype'] != 'multipart/signed' $header['mimetype'] != 'multipart/signed'
) )
{ {