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

don't wipe out the item body of a linked item to a photo when doing a normal delete and not forced

Browse Source
This commit is contained in:
friendica 2015-01-12 16:36:10 -08:00
parent cdc52ba884
commit 66cef7531a
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/items.php
View File

@ -4060,13 +4060,24 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL,$force = false) {
case DROPITEM_NORMAL: case DROPITEM_NORMAL:
default: default:
$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ), body = '', title = '', if($linked_item && ! $force) {
changed = '%s', edited = '%s' WHERE id = %d", $r = q("UPDATE item SET item_restrict = ( item_restrict | %d ),
intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED), changed = '%s', edited = '%s' WHERE id = %d",
dbesc(datetime_convert()), intval(ITEM_HIDDEN),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($item['id']) dbesc(datetime_convert()),
); intval($item['id'])
);
}
else {
$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ), body = '', title = '',
changed = '%s', edited = '%s' WHERE id = %d",
intval(ITEM_DELETED),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
}
break; break;
} }