Fix for vier theme / NonAjax Call

diff --git a/mod/item.php b/mod/item.php
index 2aaa3a38f0053f4251914a9f63d8f93fc7ff332a..54ef53a4b87961484b91de0241d3c7ce594dfa67 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -885,7 +885,12 @@ function item_content(App $a)
                if ($a->isAjax()) {
                        $o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
                } else {
-                       $o = drop_item($a->argv[2], $a->argv[3]);
+                       if (!empty($a->argv[3])) {
+                               $o = drop_item($a->argv[2], $a->argv[3]);
+                       }
+                       else {
+                               $o = drop_item($a->argv[2]);
+                       }
                }
 
                if ($a->isAjax()) {

diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 6c636d53b6000eb159250888ee5ef3286220ae7c..8debce36497f4c7e9d95cae90e852614bf6fb4e9 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -1,4 +1,3 @@
-
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_firstcollapsed}}
@@ -146,7 +145,7 @@
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a role="button" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
+                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
                                {{/if}}
                                {{if $item.edpost}}
                                        <a role="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"><span class="sr-only">{{$item.edpost.1}}</span></i></a>