From 50ff47def768f887122fad7774e60165ee5674ec Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 24 Jan 2008 10:13:00 +0000 Subject: [PATCH] fixing a possible Problem in save_edit_user. This should be it now --- calendar/inc/class.socal.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.socal.inc.php b/calendar/inc/class.socal.inc.php index fa54396bc2..65e9d6ef29 100644 --- a/calendar/inc/class.socal.inc.php +++ b/calendar/inc/class.socal.inc.php @@ -1163,11 +1163,11 @@ ORDER BY cal_user_type, cal_usre_id unset($event2update[$col]); } } - if ($cal_id && $event2update['cal_edit_user'] && $event2update['cal_edit_time']) { $locktime = ($GLOBALS['egw_info']['server']['Lock_Time_Calender'] ? $GLOBALS['egw_info']['server']['Lock_Time_Calender'] : 1); - $where = array('cal_id' => $cal_id,'cal_edit_user is NULL or cal_edit_time<'.$event2update['cal_edit_time']-$locktime); + $lockborder=$event2update['cal_edit_time']-$locktime; + $where = array('cal_id' => $cal_id,'(cal_edit_user is NULL or cal_edit_time<'.$lockborder.')'); if (!$this->db->update($this->cal_table,$event2update,$where,__LINE__,__FILE__)) { //error_log("### socal::write(".print_r($event,true).") where=".print_r($where,true)." returning false");