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

Merge branch 'dev' into 'dev'

Browse Source 
attach sync issues

See merge request hubzilla/core!1668
This commit is contained in:
Mario 2019-06-12 10:00:17 +02:00
commit 9b2cd69c0f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/Activity.php
View File

@ -1570,7 +1570,7 @@ class Activity {
$s['verb'] = self::activity_decode_mapper($act->type); $s['verb'] = self::activity_decode_mapper($act->type);
if($act->type === 'Tombstone' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) { if($act->type === 'Tombstone' || $act-type === 'Delete' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) {
$s['item_deleted'] = 1; $s['item_deleted'] = 1;
} }

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();