mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
"fixed SQL error \"unknown column 'id'\" in CalDAV reported by Christoph Kaulich on the German list"
This commit is contained in:
parent
5cf4b6eedc
commit
3f760048c6
@ -825,7 +825,7 @@ class calendar_ical extends calendar_boupdate
|
|||||||
continue; // participants without email AND CN --> ignore it
|
continue; // participants without email AND CN --> ignore it
|
||||||
}
|
}
|
||||||
elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
|
elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
|
||||||
'id,account_id,n_fn','account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
|
array('id','account_id','n_fn'),'account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
|
||||||
{
|
{
|
||||||
$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
|
$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user