harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attach sync issues

Browse Source
This commit is contained in:
zotlabs 2019-06-11 18:00:42 -07:00
parent e81e264988
commit f3b6708a92
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/import.php
View File

@ -1177,7 +1177,7 @@ function sync_files($channel, $files) {
convert_oldfields($att,'data','content'); convert_oldfields($att,'data','content');
if($att['deleted']) { if($att['deleted']) {
attach_delete($channel,$att['hash']); attach_delete($channel['channel_id'],$att['hash']);
continue; continue;
} }
@ -1383,12 +1383,14 @@ function sync_files($channel, $files) {
); );
} }
if(intval($p['imgscale']) === 0 && $p['os_storage']) if(intval($p['os_storage'])) {
$p['content'] = $store_path; $p['content'] = $store_path . ((intval($p['imgscale'])) ? '-' . $p['imgscale'] : '');
else }
else {
$p['content'] = (($p['content'])? base64_decode($p['content']) : ''); $p['content'] = (($p['content'])? base64_decode($p['content']) : '');
}
if(intval($p['imgscale']) && (! empty($p['content']))) { if (intval($p['imgscale']) && ((intval($p['os_storage'])) || (! $p['content']))) {
$time = datetime_convert(); $time = datetime_convert();