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

* Calendar: meeting requests were not recogniced by other clients as such because of lost method parameter

Browse Source
This commit is contained in:
Ralf Becker 2015-03-31 09:49:57 +00:00
parent d35ea3845d
commit a2b018bef8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.egw_mailer.inc.php
View File

@ -314,6 +314,11 @@ class egw_mailer extends Horde_Mime_Mail
}
$part = new Horde_Mime_Part();
$part->setType($type ? $type : egw_vfs::mime_content_type($file));
$matches = null;
if (preg_match('/^([^;]+);\s*([^=]+)=([^;]+)$/', $type, $matches))
{
$part->setContentTypeParameter($matches[2], $matches[3]);
}
$part->setContents($resource);
$part->setName($name ? $name : egw_vfs::basename($file));
@ -380,6 +385,11 @@ class egw_mailer extends Horde_Mime_Mail
$part = new Horde_Mime_Part();
$part->setType($type);
$matches = null;
if (preg_match('/^([^;]+);\s*([^=]+)=([^;]+)$/', $type, $matches))
{
$part->setContentTypeParameter($matches[2], $matches[3]);
}
$part->setCharset('utf-8');
$part->setContents($content);
// this should not be necessary, because binary data get detected by mime-type,