beenull/calendar
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Synchronized recent changes from git.kolab.org repository

Browse source
This commit is contained in:
Thomas Bruederli 2014-10-05 16:50:51 +02:00
parent 453b068b2c
commit f1e13aa0e4
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
calendar.php
View file

@ -1928,6 +1928,7 @@ class calendar extends rcube_plugin
}
$html = '';
$seen = array();
foreach ($this->ics_parts as $mime_id) {
$part = $this->message->mime_parts[$mime_id];
$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)
continue;
// avoid duplicates with the same UID (e.g. from Google invitations, #3585)
if ($seen[$event['uid']]++)
continue;
// define buttons according to method
if ($this->ical->method == 'REPLY') {
$title = $this->gettext('itipreply');

2
drivers/database/SQL/mysql.initial.sql
View file

@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `attachments` (
`filename` varchar(255) NOT NULL DEFAULT '',
`mimetype` varchar(255) NOT NULL DEFAULT '',
`size` int(11) NOT NULL DEFAULT '0',
`data` longtext NOT NULL DEFAULT '',
`data` longtext NOT NULL,
PRIMARY KEY(`attachment_id`),
CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE