mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 09:09:04 +01:00
Make sure distributionlist is resolved in mail compose after submit action
This commit is contained in:
parent
f05b5ee719
commit
dcccc2ef7e
@ -1279,6 +1279,13 @@ class mail_compose
|
||||
// join again mailaccount and identity
|
||||
$content['mailaccount'] .= ':'.$content['mailidentity'];
|
||||
|
||||
// Resolve distribution list before send content to client
|
||||
foreach(array('to', 'cc', 'bcc', 'replyto') as $f)
|
||||
{
|
||||
if (is_array($content[$f])) $content[$f]= self::resolveEmailAddressList ($content[$f]);
|
||||
}
|
||||
|
||||
$content['to'] = self::resolveEmailAddressList($content['to']);
|
||||
//error_log(__METHOD__.__LINE__.array2string($content));
|
||||
$etpl->exec('mail.mail_compose.compose',$content,$sel_options,array(),$preserv,2);
|
||||
}
|
||||
@ -2551,7 +2558,7 @@ class mail_compose
|
||||
if (!empty($addr)) $_emailAddressList[]=$addr;
|
||||
}
|
||||
}
|
||||
return $_emailAddressList;
|
||||
return array_values($_emailAddressList);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user