From 586a58a4e7d1276d78839e889d7bb7a66df03abe Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 1 Jun 2010 07:36:14 +0000
Subject: [PATCH] Fix purging old events to get rid of events for all users,
 not just the admin that set it.

---
 calendar/inc/class.calendar_boupdate.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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