D4517.1775390031.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D4517.1775390031.diff
View Options

	diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
	--- a/lib/kolab_sync_data_email.php
	+++ b/lib/kolab_sync_data_email.php
	@@ -466,6 +466,8 @@
	$result['categories'] = $this->getKolabTags($message);
	}

	+ $is_ios = preg_match('/(iphone\|ipad)/i', $this->device->devicetype);
	+
	// attachments
	$attachments = array_merge($message->attachments, $message->inline_parts);
	if (!empty($attachments)) {
	@@ -474,6 +476,10 @@
	foreach ($attachments as $attachment) {
	$att = array();

	+ if ($is_ios && !empty($event) && $attachment->mime_id == $event['_mime_id']) {
	+ continue;
	+ }
	+
	$filename = rcube_charset::clean($attachment->filename);
	if (empty($filename) && $attachment->mimetype == 'text/html') {
	$filename = 'HTML Part';
	@@ -1801,9 +1807,12 @@
	foreach ($ical_objects as $mime_id => $event) {
	if ($event['_type'] == 'event') {
	$event['_method'] = $ical_objects->method;
	+ $event['_mime_id'] = $ical_objects->mime_id;
	+
	return $event;
	}
	}
	+
	return null;
	}