From c383d17d3a73607425222781b1c49ca8eafaed18 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 7 Mar 2006 20:30:29 +0000 Subject: [PATCH] fix for bug submitted by Cornelius: participants get lost in the conflict display --- calendar/inc/class.uiforms.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.uiforms.inc.php b/calendar/inc/class.uiforms.inc.php index 6668141dcf..ee09094101 100644 --- a/calendar/inc/class.uiforms.inc.php +++ b/calendar/inc/class.uiforms.inc.php @@ -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();