Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
		| @@ -1035,8 +1035,9 @@ function import_mail($channel, $mails, $sync = false) { | ||||
| 			if(! $m) | ||||
| 				continue; | ||||
|  | ||||
| 			$m['aid'] = $channel['channel_account_id']; | ||||
| 			$m['uid'] = $channel['channel_id']; | ||||
| 			$m['account_id'] = $channel['channel_account_id']; | ||||
| 			$m['channel_id'] = $channel['channel_id']; | ||||
|  | ||||
| 			$mail_id = mail_store($m); | ||||
| 			if($sync && $mail_id) { | ||||
| 				Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id)); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user