mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 09:09:04 +01:00
fix for bug submitted by Cornelius: participants get lost in the conflict display
This commit is contained in:
parent
cac3a768eb
commit
c383d17d3a
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user