diff options
| author | Max Kostikov <max@kostikov.co> | 2019-08-22 20:25:57 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-08-22 20:25:57 +0200 |
| commit | 09d7cf2cc1d23fc23b084181342192e328234920 (patch) | |
| tree | 5612224a1ce66c249767db192cc45c1e34886f86 | |
| parent | cab24836d86e58549cb776b054d280a4b7ab7cf0 (diff) | |
| parent | 58d7c7f6aed50d8b40334c011490b1b26eee4ede (diff) | |
| download | volse-hubzilla-09d7cf2cc1d23fc23b084181342192e328234920.tar.gz volse-hubzilla-09d7cf2cc1d23fc23b084181342192e328234920.tar.bz2 volse-hubzilla-09d7cf2cc1d23fc23b084181342192e328234920.zip | |
Merge branch 'dev' into 'dev'
Fix attach permissions sync for clonned channel
See merge request hubzilla/core!1716
| -rw-r--r-- | include/import.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/import.php b/include/import.php index 1d3b7c035..d3e8f7091 100644 --- a/include/import.php +++ b/include/import.php @@ -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']); |