Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

This commit is contained in:
Domovoy 2012-08-07 09:40:21 +02:00
commit f3b1391501
22 changed files with 4401 additions and 4126 deletions

View file

@ -3701,6 +3701,7 @@ function drop_item($id,$interactive = true) {
if((local_user() == $item['uid']) || (remote_user() == $item['contact-id']) || (! $interactive)) {
logger('delete item: ' . $item['id'], LOGGER_DEBUG);
// delete the item
$r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",