Fix purging old events to get rid of events for all users, not just the admin that set it.

This commit is contained in:
Nathan Gray 2010-06-01 07:36:14 +00:00
parent 8bbcafe1c0
commit 586a58a4e7

View File

@ -1214,7 +1214,7 @@ class calendar_boupdate extends calendar_bo
elseif ($config['calendar_delete_history']) elseif ($config['calendar_delete_history'])
{ {
$event['deleted'] = true; $event['deleted'] = true;
$this->save($event); $this->save($event, $ignore_acl);
// Actually delete alarms // Actually delete alarms
if (isset($event['alarm']) && is_array($event['alarm'])) if (isset($event['alarm']) && is_array($event['alarm']))
{ {
@ -2221,8 +2221,10 @@ class calendar_boupdate extends calendar_bo
{ {
$query = array( $query = array(
'end' => strtotime("-$age years", time()), 'end' => strtotime("-$age years", time()),
'enum_recuring' => false 'enum_recuring' => false,
'users' => array_keys($GLOBALS['egw']->accounts->search(array()))
); );
$events = $this->search($query); $events = $this->search($query);
foreach($events as $event) foreach($events as $event)
{ {