Merge pull request #6162 from JonnyTischbein/issue_delete_comment_from_guid

Delete comment from its guid and return to parent guid

diff --git a/include/items.php b/include/items.php
index 87f0a2d4e0e005fcba459cc2ab9408be6e2b1e45..b9e1a0c9944d97f2b2d9094b8e67dc414a5b1263 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -352,7 +352,7 @@ function drop_item($id, $return = '')
 
        // locate item to be deleted
 
-       $fields = ['id', 'uid', 'guid', 'contact-id', 'deleted', 'gravity'];
+       $fields = ['id', 'uid', 'guid', 'contact-id', 'deleted', 'gravity', parent];
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
        if (!DBA::isResult($item)) {
@@ -408,6 +408,11 @@ function drop_item($id, $return = '')
                }
 
                $is_comment = ($item['gravity'] == GRAVITY_COMMENT) ? true : false;
+               $parentitem = null;
+               if (!empty($item['parent'])){
+                       $fields = ['guid'];
+                       $parentitem = Item::selectFirstForUser(local_user(), $fields, ['id' => $item['parent']]);
+               }
 
                // delete the item
                Item::deleteForUser(['id' => $item['id']], local_user());
@@ -417,14 +422,28 @@ function drop_item($id, $return = '')
                // removes update_* from return_url to ignore Ajax refresh
                $return_url = str_replace("update_", "", $return_url);
 
-               // 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');
-                       //NOTREACHED
+               // Check if delete a comment
+               if ($is_comment) {
+                       // Return to parent guid
+                       if (!empty($parentitem)) {
+                               $a->internalRedirect('display/' . $parentitem['guid']);
+                               //NOTREACHED
+                       }
+                       // In case something goes wrong
+                       else {
+                               $a->internalRedirect('network');
+                               //NOTREACHED
+                       }
                }
                else {
-                       $a->internalRedirect($return_url);
-                       //NOTREACHED
+                       // if unknown location or deleting top level post called from display
+                       if (empty($return_url) || strpos($return_url, 'display') !== false) {
+                               $a->internalRedirect('network');
+                               //NOTREACHED
+                       } else {
+                               $a->internalRedirect($return_url);
+                               //NOTREACHED
+                       }
                }
        } else {
                notice(L10n::t('Permission denied.') . EOL);