oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	include/conversation.php
This commit is contained in:
Domovoy 2012-08-05 13:43:53 +02:00
commit e247915f48
21 changed files with 72 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/items.php
View file

@ -3699,7 +3699,7 @@ function drop_item($id,$interactive = true) {
// check if logged in user is either the author or owner of this item
if((local_user() == $item['uid']) || (remote_user() == $item['contact-id'])) {
if((local_user() == $item['uid']) || (remote_user() == $item['contact-id']) || (! $interactive)) {
// delete the item