mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-24 03:41:53 +02:00
fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events
This commit is contained in:
parent
8f4960f9b4
commit
7edb16d35a
@ -888,7 +888,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,
|
||||||
array('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'),'egw_addressbook.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…
x
Reference in New Issue
Block a user