strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6153 from JonnyTischbein/issue_return_delete_comments

Browse source 
Fix return url when delete comment from display
This commit is contained in:
Hypolite Petovan 2018-11-17 09:54:47 -05:00 committed by GitHub
commit 9c2ba6abe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/items.php
View file

@ -352,7 +352,7 @@ function drop_item($id, $return = '')
// locate item to be deleted // locate item to be deleted
$fields = ['id', 'uid', 'guid', 'contact-id', 'deleted']; $fields = ['id', 'uid', 'guid', 'contact-id', 'deleted', 'gravity'];
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]); $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
@ -407,6 +407,8 @@ function drop_item($id, $return = '')
$a->internalRedirect('display/' . $item['guid']); $a->internalRedirect('display/' . $item['guid']);
} }
$is_comment = ($item['gravity'] == GRAVITY_COMMENT) ? true : false;
// delete the item // delete the item
Item::deleteForUser(['id' => $item['id']], local_user()); Item::deleteForUser(['id' => $item['id']], local_user());
@ -415,7 +417,8 @@ function drop_item($id, $return = '')
// removes update_* from return_url to ignore Ajax refresh // removes update_* from return_url to ignore Ajax refresh
$return_url = str_replace("update_", "", $return_url); $return_url = str_replace("update_", "", $return_url);
if (empty($return_url) || strpos($return_url, 'display') !== false) { // if unknown location or top level post called from display
if (empty($return_url) || ((strpos($return_url, 'display') !== false) AND (!$is_comment))) {
$a->internalRedirect('network'); $a->internalRedirect('network');
//NOTREACHED //NOTREACHED
} }