Skip to content

Commit

Permalink
Bug:14118 Parse attendees when replacing event via API.
Browse files Browse the repository at this point in the history
We parse them when importing, so we need to honor any changes when
replacing.
  • Loading branch information
mrubinsk committed Oct 22, 2015
1 parent 95f82b8 commit 0e9c907
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kronolith/lib/Api.php
Expand Up @@ -770,7 +770,7 @@ public function import($content, $contentType, $calendar = null)
protected function _addiCalEvent($content, $driver, $exception = false)
{
$event = $driver->getEvent();
$event->fromiCalendar($content);
$event->fromiCalendar($content, true);
// Check if the entry already exists in the data source, first by UID.
if (!$exception) {
try {
Expand Down Expand Up @@ -1081,7 +1081,7 @@ public function replace($uid, $content, $contentType, $calendar = null)
$component->getAttribute('RECURRENCE-ID');
$this->_addiCalEvent($component, Kronolith::getDriver(null, $calendar), true);
} catch (Horde_Icalendar_Exception $e) {
$event->fromiCalendar($component);
$event->fromiCalendar($component, true);
// Ensure we keep the original UID, even when content does not
// contain one and fromiCalendar creates a new one.
$event->uid = $uid;
Expand Down

0 comments on commit 0e9c907

Please sign in to comment.