Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti 2019-01-11 10:14:06 +01:00
commit dc8da4717f

View File

@ -1035,8 +1035,9 @@ function import_mail($channel, $mails, $sync = false) {
if(! $m) if(! $m)
continue; continue;
$m['aid'] = $channel['channel_account_id']; $m['account_id'] = $channel['channel_account_id'];
$m['uid'] = $channel['channel_id']; $m['channel_id'] = $channel['channel_id'];
$mail_id = mail_store($m); $mail_id = mail_store($m);
if($sync && $mail_id) { if($sync && $mail_id) {
Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id)); Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id));