fix for "Column 'account_id' in field list is ambiguous" ERROR while importing events 2nd.go

This commit is contained in:
Klaus Leithoff 2009-07-09 08:33:25 +00:00
parent 917e529e8d
commit afc6bc3b99

View File

@ -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'),'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR'))) array('id','egw_addressbook.account_id as 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'];
} }