Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DB driver: accept categories field to be an array. libcalendaring ical parser provides array values here (#2797)

Browse source
This commit is contained in:
Thomas Bruederli 2014-01-27 11:25:17 +01:00
parent 0f57d5c8c8
commit 028c21f4ca
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/drivers/database/database_driver.php
View file

@ -254,7 +254,7 @@ class database_driver extends calendar_driver
strval($event['title']), strval($event['title']),
strval($event['description']), strval($event['description']),
strval($event['location']), strval($event['location']),
strval($event['categories']), join(',', (array)$event['categories']),
strval($event['url']), strval($event['url']),
intval($event['free_busy']), intval($event['free_busy']),
intval($event['priority']), intval($event['priority']),
@ -470,6 +470,8 @@ class database_driver extends calendar_driver
foreach ($set_cols as $col) { foreach ($set_cols as $col) {
if (is_object($event[$col]) && is_a($event[$col], 'DateTime')) if (is_object($event[$col]) && is_a($event[$col], 'DateTime'))
$sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]->format(self::DB_DATE_FORMAT)); $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]->format(self::DB_DATE_FORMAT));
else if (is_array($event[$col]))
$sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote(join(',', $event[$col]));
else if (isset($event[$col])) else if (isset($event[$col]))
$sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]); $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]);
} }