aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2015-09-08 08:39:37 +0200
committerzottel <github@zottel.net>2015-09-08 08:39:37 +0200
commit52cd8652bb4b2454bc2bd49d8ec39a5549c4ab68 (patch)
tree8e25e4395d8ef7f0dbbe0f12450ad4b9d7cb20c0 /include/zot.php
parentc5981cbc9afb88015fb59b4743484bb78a87188d (diff)
parentc6bdf7e891f3c0b49a1e9c40622e05aef590e2b6 (diff)
downloadvolse-hubzilla-52cd8652bb4b2454bc2bd49d8ec39a5549c4ab68.tar.gz
volse-hubzilla-52cd8652bb4b2454bc2bd49d8ec39a5549c4ab68.tar.bz2
volse-hubzilla-52cd8652bb4b2454bc2bd49d8ec39a5549c4ab68.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 9610df894..285668209 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2882,7 +2882,19 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
sync_apps($channel,$arr['app']);
if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
- sync_apps($channel,$arr['chatroom']);
+ sync_chatrooms($channel,$arr['chatroom']);
+
+ if(array_key_exists('event',$arr) && $arr['event'])
+ sync_events($channel,$arr['event']);
+
+ if(array_key_exists('event_item',$arr) && $arr['event_item'])
+ sync_items($channel,$arr['event_item']);
+
+ if(array_key_exists('item',$arr) && $arr['item'])
+ sync_items($channel,$arr['item']);
+
+ if(array_key_exists('item_id',$arr) && $arr['item_id'])
+ sync_items($channel,$arr['item_id']);
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
if(array_key_exists('channel_page_flags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {