From b6284d1664cbc42b39eb102afd03408c6bef2d54 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 11 Nov 2016 10:35:04 +0100 Subject: [PATCH] Fixes retargeting a share of a deleted source Fixes #1862 We tried to construct the actual node. While this node was no longer available. This work around makes sure that we don't try to do this. Signed-off-by: Roeland Jago Douma --- lib/private/Share20/DefaultShareProvider.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index f33c297b02d..c165d2e5c73 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -434,9 +434,9 @@ class DefaultShareProvider implements IShareProvider { 'uid_owner' => $qb->createNamedParameter($share->getShareOwner()), 'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()), 'parent' => $qb->createNamedParameter($share->getId()), - 'item_type' => $qb->createNamedParameter($share->getNode() instanceof File ? 'file' : 'folder'), - 'item_source' => $qb->createNamedParameter($share->getNode()->getId()), - 'file_source' => $qb->createNamedParameter($share->getNode()->getId()), + 'item_type' => $qb->createNamedParameter($share->getNodeType()), + 'item_source' => $qb->createNamedParameter($share->getNodeId()), + 'file_source' => $qb->createNamedParameter($share->getNodeId()), 'file_target' => $qb->createNamedParameter($share->getTarget()), 'permissions' => $qb->createNamedParameter($share->getPermissions()), 'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),