Merge branch 'dev' into 'dev'

Fix attach permissions sync for clonned channel

See merge request hubzilla/core!1716
This commit is contained in:
Max Kostikov 2019-08-22 20:25:57 +02:00
commit 09d7cf2cc1

View File

@ -1190,9 +1190,9 @@ function sync_files($channel, $files) {
logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG);
if($x['success']) {
$orig_attach = $x[0];
$orig_attach = $x['data'];
$attach_exists = true;
$attach_id = $x[0]['id'];
$attach_id = $orig_attach['id'];
}
$newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['content']);