aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2019-01-20 12:58:27 +0100
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2019-01-20 12:58:27 +0100
commit4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0 (patch)
tree49111cffad0616616f4ce76fed9dd6b4fad8e41f /include/import.php
parent618d673947dc627dcdac3f9b6da7f31123472b05 (diff)
parent39128c34ccf48cc23ed368cf5bbedd71b5ef75db (diff)
downloadvolse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.tar.gz
volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.tar.bz2
volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/import.php')
-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));