diff options
author | zottel <github@zottel.net> | 2015-09-04 12:24:52 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2015-09-04 12:24:52 +0200 |
commit | 938ef930d4b7353cc4e3c1f9dac015e91b96667b (patch) | |
tree | c36e6797853b230ee6311bc8295bce56b13dbcbb /include/zot.php | |
parent | 015c7243b9b688acda9c1defce9055fe2c3c2e61 (diff) | |
parent | b1888afa108fb09d0ebe3d50cc70ee9024ea76f1 (diff) | |
download | volse-hubzilla-938ef930d4b7353cc4e3c1f9dac015e91b96667b.tar.gz volse-hubzilla-938ef930d4b7353cc4e3c1f9dac015e91b96667b.tar.bz2 volse-hubzilla-938ef930d4b7353cc4e3c1f9dac015e91b96667b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index fecaa7ad2..9610df894 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2881,6 +2881,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(array_key_exists('app',$arr) && $arr['app']) sync_apps($channel,$arr['app']); + if(array_key_exists('chatroom',$arr) && $arr['chatroom']) + sync_apps($channel,$arr['chatroom']); + 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'])) { $arr['channel']['channel_removed'] = (($arr['channel']['channel_pageflags'] & 0x8000) ? 1 : 0); |