diff options
author | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
commit | 2848f5dab4e0f904280e77d6403ab69926cabe1d (patch) | |
tree | bcb2f2a70660d7abe319b126035d2e0b2ddd2c41 /include/zot.php | |
parent | 3c7d2d4cea80fae5113de8c78ed522ce8b32c16d (diff) | |
parent | f0f5a8f2b510b92aa1fde2cbaf118a784c154432 (diff) | |
download | volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.gz volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.bz2 volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index dd9222bf3..b1cb5a8ec 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3002,6 +3002,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(array_key_exists('chatroom',$arr) && $arr['chatroom']) sync_chatrooms($channel,$arr['chatroom']); + if(array_key_exists('conv',$arr) && $arr['conv']) + import_conv($channel,$arr['conv']); + + if(array_key_exists('mail',$arr) && $arr['mail']) + import_mail($channel,$arr['mail']); + if(array_key_exists('event',$arr) && $arr['event']) sync_events($channel,$arr['event']); |