From d18421f7608e855bb0af5e81ed1b85d0a0553619 Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Tue, 9 Oct 2018 20:40:25 +0200
Subject: [PATCH] Return to item if not owned by user or canceld

---
 include/items.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index 8b666f1ca..cfd792e2d 100644
--- a/include/items.php
+++ b/include/items.php
@@ -349,7 +349,7 @@ function drop_item($id)
 
 	// locate item to be deleted
 
-	$fields = ['id', 'uid', 'contact-id', 'deleted'];
+	$fields = ['id', 'uid', 'guid', 'contact-id', 'deleted'];
 	$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
 	if (!DBA::isResult($item)) {
@@ -401,7 +401,7 @@ function drop_item($id)
 		}
 		// Now check how the user responded to the confirmation query
 		if (!empty($_REQUEST['canceled'])) {
-			goaway('/item/drop/' . $id);
+			goaway('/display/' . $item['guid']);
 		}
 
 		// delete the item
@@ -411,7 +411,7 @@ function drop_item($id)
 		//NOTREACHED
 	} else {
 		notice(L10n::t('Permission denied.') . EOL);
-		goaway('/item/drop/' . $id);
+		goaway('/display/' . $item['guid']);
 		//NOTREACHED
 	}
 }