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

do NOT return iCalendar for displayable body, mail triggers calendar meeting display from attachment

Browse Source
This commit is contained in:
Ralf Becker 2015-10-22 14:34:35 +00:00
parent d3f688760f
commit a8e13d4526
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -4151,7 +4151,6 @@ class emailadmin_imapbase
}
/**
* getMultipartAlternative
* get part of the message, if its stucture is indicating its of multipart alternative style
* a wrapper for multipartmixed
* @param string/int $_uid the messageuid,
@ -4187,11 +4186,6 @@ class emailadmin_imapbase
case 'text':
switch($mimePart->getSubType())
{
case 'calendar': // only if there is no partText set already
//if ($partText) break;
if ($mimePart->getBytes() > 0) $partCalendar = $mimePart;
break;
// fall throught
case 'plain':
if ($mimePart->getBytes() > 0) $partText = $mimePart;
break;
@ -4224,9 +4218,6 @@ class emailadmin_imapbase
}
}
}
// seems we have a multipart/alternative; as we assume we are able to display events
// the text/calendar part has higher precedence then text/plain
if ($partCalendar && $partText) $partText = $partCalendar;
switch($_htmlMode)
{