Redirect to previous page after NON-AJAX Post delete via second parameter in /item...

diff --git a/include/items.php b/include/items.php
index 887bbb5b685b5d387d0d163d795b6cce82c6e660..6eb1345889ca12b584590a05153c05dab321c62a 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -345,7 +345,7 @@ function drop_items(array $items)
        }
 }
 
-function drop_item($id)
+function drop_item($id, $return)
 {
        $a = BaseObject::getApp();
 
@@ -409,8 +409,16 @@ function drop_item($id)
                // delete the item
                Item::deleteForUser(['id' => $item['id']], local_user());
 
-               $a->internalRedirect('network');
-               //NOTREACHED
+               $return_url = hex2bin($return);
+               notice("RETURN: " + $return_url);
+               if (empty($return_url) || strpos($return_url, 'display') ) {
+                       $a->internalRedirect('network');
+                       //NOTREACHED
+               }
+               else {
+                       $a->internalRedirect($return_url);
+                       //NOTREACHED
+               }
        } else {
                notice(L10n::t('Permission denied.') . EOL);
                $a->internalRedirect('display/' . $item['guid']);

diff --git a/mod/item.php b/mod/item.php
index c7dbfd21c689896457a4e34bfaf7c577508cd279..2aaa3a38f0053f4251914a9f63d8f93fc7ff332a 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -881,11 +881,11 @@ function item_content(App $a)
 
        $o = '';
 
-       if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
+       if (($a->argc >= 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
                if ($a->isAjax()) {
                        $o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
                } else {
-                       $o = drop_item($a->argv[2]);
+                       $o = drop_item($a->argv[2], $a->argv[3]);
                }
 
                if ($a->isAjax()) {

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 086b78960a81d3d2982ba636083a4dbfca274bf5..e2c1ea03c3f7186af863d9dd7efe10c9ed471c3f 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -414,6 +414,7 @@ class Post extends BaseObject
                        'received'        => $item['received'],
                        'commented'       => $item['commented'],
                        'created_date'    => $item['created'],
+                       'return'          => ($a->cmd) ? bin2hex($a->cmd) : '',
                ];
 
                $arr = ['item' => $item, 'output' => $tmp_item];

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 53efacda7020899ca4ea1229280d6758b9f31481..c46fc339dd1ff742fb7a6d8658f31c4779e3aae2 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -141,7 +141,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">
-                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
+                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
                                        </li>
                                        {{/if}}
                                </ul>