aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-01-11 10:14:06 +0100
committerMario Vavti <mario@mariovavti.com>2019-01-11 10:14:06 +0100
commitdc8da4717f59c850633469d2ece792e04c02b834 (patch)
tree9e79189f3a67c5741376e0212576241858ac4ea4
parentd32360cb3ec447969dcdf9f1427a4b55134dd1bb (diff)
parent7b30fc4b82da0a64e152cdeb82564f8d52b7177e (diff)
downloadvolse-hubzilla-dc8da4717f59c850633469d2ece792e04c02b834.tar.gz
volse-hubzilla-dc8da4717f59c850633469d2ece792e04c02b834.tar.bz2
volse-hubzilla-dc8da4717f59c850633469d2ece792e04c02b834.zip
Merge remote-tracking branch 'mike/master' into dev
-rw-r--r--include/import.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/import.php b/include/import.php
index 53b21c317..3bd8b4105 100644
--- a/include/import.php
+++ b/include/import.php
@@ -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));