diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-28 16:51:47 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-28 16:51:47 -0700 |
| commit | 095e2bf0b39fdf18217b15f5f743e32e2a49d587 (patch) | |
| tree | f58ff512f89d92e0013c0ac0f228eca10bd23d6b /include/zot.php | |
| parent | ffee413d2d9bb153dad4efd6b79e6568a73c0bd6 (diff) | |
| download | volse-hubzilla-095e2bf0b39fdf18217b15f5f743e32e2a49d587.tar.gz volse-hubzilla-095e2bf0b39fdf18217b15f5f743e32e2a49d587.tar.bz2 volse-hubzilla-095e2bf0b39fdf18217b15f5f743e32e2a49d587.zip | |
file clone sync issue, 1. channel permission import had no uid, 2. mod_getfile was sending attach['data'] instead of attach['content']
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 4 insertions, 1 deletions
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. |