Synchronized recent changes from git.kolab.org repository
This commit is contained in:
parent
453b068b2c
commit
f1e13aa0e4
|
@ -1928,6 +1928,7 @@ class calendar extends rcube_plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
$html = '';
|
$html = '';
|
||||||
|
$seen = array();
|
||||||
foreach ($this->ics_parts as $mime_id) {
|
foreach ($this->ics_parts as $mime_id) {
|
||||||
$part = $this->message->mime_parts[$mime_id];
|
$part = $this->message->mime_parts[$mime_id];
|
||||||
$charset = $part->ctype_parameters['charset'] ? $part->ctype_parameters['charset'] : RCMAIL_CHARSET;
|
$charset = $part->ctype_parameters['charset'] ? $part->ctype_parameters['charset'] : RCMAIL_CHARSET;
|
||||||
|
@ -1944,6 +1945,10 @@ class calendar extends rcube_plugin
|
||||||
if ($event['_type'] != 'event') // skip non-event objects (#2928)
|
if ($event['_type'] != 'event') // skip non-event objects (#2928)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// avoid duplicates with the same UID (e.g. from Google invitations, #3585)
|
||||||
|
if ($seen[$event['uid']]++)
|
||||||
|
continue;
|
||||||
|
|
||||||
// define buttons according to method
|
// define buttons according to method
|
||||||
if ($this->ical->method == 'REPLY') {
|
if ($this->ical->method == 'REPLY') {
|
||||||
$title = $this->gettext('itipreply');
|
$title = $this->gettext('itipreply');
|
||||||
|
|
|
@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `attachments` (
|
||||||
`filename` varchar(255) NOT NULL DEFAULT '',
|
`filename` varchar(255) NOT NULL DEFAULT '',
|
||||||
`mimetype` varchar(255) NOT NULL DEFAULT '',
|
`mimetype` varchar(255) NOT NULL DEFAULT '',
|
||||||
`size` int(11) NOT NULL DEFAULT '0',
|
`size` int(11) NOT NULL DEFAULT '0',
|
||||||
`data` longtext NOT NULL DEFAULT '',
|
`data` longtext NOT NULL,
|
||||||
PRIMARY KEY(`attachment_id`),
|
PRIMARY KEY(`attachment_id`),
|
||||||
CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
|
CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
|
||||||
REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE
|
REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
|
Loading…
Reference in a new issue