holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When deleting but keeping events, hold on to links as well so they can be restored if event is restored

Browse Source
This commit is contained in:
Nathan Gray 2010-09-27 18:03:46 +00:00
parent d7168805c9
commit 2b13b73b60
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -352,6 +352,11 @@ class calendar_boupdate extends calendar_bo
$event = $this->read($cal_id); // we re-read the event, in case only partial information was update and we need the full info for the notifies
//echo "new $cal_id="; _debug_array($event);
if($old_event['deleted'] && $event['deleted'] == null)
{
// Restored, bring back links
egw_link::restore('calendar', $cal_id);
}
if ($this->log_file)
{
$this->log2file($event2save,$event,$old_event);
@ -1241,6 +1246,9 @@ class calendar_boupdate extends calendar_bo
}
elseif ($config['calendar_delete_history'])
{
// mark all links to the event as deleted, but keep them
egw_link::unlink(0,'calendar',$cal_id,'','','',true);
$event['deleted'] = $this->now;
$this->save($event, $ignore_acl);
// Actually delete alarms