mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
"fixed problem of last commit (creating new dates dont work), reported by Uwe Redecker on the German list"
This commit is contained in:
parent
4f94d5837d
commit
97c5b06441
@ -540,7 +540,7 @@ ORDER BY cal_user_type, cal_usre_id
|
|||||||
|
|
||||||
if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
|
if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
|
||||||
|
|
||||||
$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__);
|
$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
|
||||||
if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
|
if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@ -1085,7 +1085,7 @@ ORDER BY cal_user_type, cal_usre_id
|
|||||||
$this->db->delete($this->user_table,array(
|
$this->db->delete($this->user_table,array(
|
||||||
'cal_user_type' => $user_type,
|
'cal_user_type' => $user_type,
|
||||||
'cal_user_id' => $user_id,
|
'cal_user_id' => $user_id,
|
||||||
),__LINE__,__FILE__);
|
),__LINE__,__FILE__,'calendar');
|
||||||
|
|
||||||
// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
|
// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
|
||||||
foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
|
foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
|
||||||
|
Loading…
Reference in New Issue
Block a user