mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 20:49:04 +01:00
* Calendar: meeting requests were not recogniced by other clients as such because of lost method parameter
This commit is contained in:
parent
d35ea3845d
commit
a2b018bef8
@ -314,6 +314,11 @@ class egw_mailer extends Horde_Mime_Mail
|
|||||||
}
|
}
|
||||||
$part = new Horde_Mime_Part();
|
$part = new Horde_Mime_Part();
|
||||||
$part->setType($type ? $type : egw_vfs::mime_content_type($file));
|
$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->setContents($resource);
|
||||||
$part->setName($name ? $name : egw_vfs::basename($file));
|
$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 = new Horde_Mime_Part();
|
||||||
$part->setType($type);
|
$part->setType($type);
|
||||||
|
$matches = null;
|
||||||
|
if (preg_match('/^([^;]+);\s*([^=]+)=([^;]+)$/', $type, $matches))
|
||||||
|
{
|
||||||
|
$part->setContentTypeParameter($matches[2], $matches[3]);
|
||||||
|
}
|
||||||
$part->setCharset('utf-8');
|
$part->setCharset('utf-8');
|
||||||
$part->setContents($content);
|
$part->setContents($content);
|
||||||
// this should not be necessary, because binary data get detected by mime-type,
|
// this should not be necessary, because binary data get detected by mime-type,
|
||||||
|
Loading…
Reference in New Issue
Block a user