fix for bug submitted by Cornelius: participants get lost in the conflict display

This commit is contained in:
Ralf Becker 2006-03-07 20:30:29 +00:00
parent cac3a768eb
commit c383d17d3a

View File

@ -187,7 +187,11 @@ class uiforms extends uical
unset($event['new_alarm']);
unset($event['alarm']['delete_alarm']);
if (isset($content['participants']) && !(isset($content['view']) && $content['view'])) // convert content => event
if (in_array($button,array('ignore','freetime','reedit'))) // called from conflict display
{
// no conversation necessary, event is already in the right format
}
elseif (isset($content['participants']) && !(isset($content['view']) && $content['view'])) // convert content => event
{
//echo "participants="; _debug_array($content['participants']);
$event['participants'] = $event['participant_types'] = array();