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

old dates could not be updated, so we fixed that.

Browse Source
This commit is contained in:
Klaus Leithoff 2008-01-23 07:40:09 +00:00
parent 043930cfb9
commit d204144ea3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.socal.inc.php
View File

@ -514,14 +514,14 @@ ORDER BY cal_user_type, cal_usre_id
// while saving handle the etag as condition for the update, to check if an entry was saved before this action occured
$check_etag = ($check_modified ? $check_modified : $event['cal_etag']);
if ($cal_id)
if ($cal_id && $check_etag)
{
$event['cal_etag']=$check_etag+1;
$event['cal_edit_user']=NULL;
$event['cal_edit_time']=NULL;
// cal_etag will be set on first save (if not set)
$where = array('cal_id' => $cal_id,'cal_etag'=>$check_etag);
$where = array('cal_id' => $cal_id,'cal_etag is NULL or cal_etag='.$check_etag);
#if ($check_etag) $where['cal_etag'] = $check_etag;
if (!$this->db->update($this->cal_table,$event,$where,__LINE__,__FILE__))
{
@ -536,7 +536,7 @@ ORDER BY cal_user_type, cal_usre_id
}
} else {
$event['cal_etag']=$check_modified;
$event['cal_etag']=($check_etag?$check_etag:1);
}
if ($cal_id)