Calendar: Fix user listed in participants twice when creating an event from an email

This commit is contained in:
nathan 2022-12-23 10:45:53 -07:00
parent 7c8e0b12b2
commit a1da1a6fa6

View File

@ -573,7 +573,7 @@ class calendar_uiforms extends calendar_ui
if (is_numeric($uid))
{
$id = $uid;
$type = 'u';
$type = '';
}
else
{
@ -3500,12 +3500,12 @@ class calendar_uiforms extends calendar_ui
$AB = new Api\Contacts();
$accounts = array(0 => $GLOBALS['egw_info']['user']['account_id']);
$participants[0] = array (
$participants[0] = array(
'uid' => $GLOBALS['egw_info']['user']['account_id'],
'delete_id' => $GLOBALS['egw_info']['user']['account_id'],
'status' => 'A',
'old_status' => 'A',
'app' => 'User',
'app' => 'api-accounts',
'role' => 'REQ-PARTICIPANT'
);
foreach($mailContent['addresses'] as $address)
@ -3514,7 +3514,7 @@ class calendar_uiforms extends calendar_ui
$contacts = $AB->search(array(
'email' => $address['email'],
'email_home' => $address['email']
),'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id','','','',false,'OR',false,array('owner' => 0),'',false);
), 'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id', '', '', '', false, 'OR', false, array('owner' => 0), '', false);
if (is_array($contacts))
{
foreach($contacts as $account)