From 095e2bf0b39fdf18217b15f5f743e32e2a49d587 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 28 Sep 2016 16:51:47 -0700 Subject: file clone sync issue, 1. channel permission import had no uid, 2. mod_getfile was sending attach['data'] instead of attach['content'] --- include/zot.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/zot.php b/include/zot.php index e0a86abc0..f5b7a383e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3164,7 +3164,10 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) { - translate_channel_perms_inbound($arr['channel']); + $remote_channel = $arr['channel']; + $remote_channel['channel_id'] = $channel['channel_id']; + translate_channel_perms_inbound($remote_channel); + if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) { // These flags cannot be sync'd. -- cgit v1.2.3