sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get node by path as fallback 

Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/1441/head
Robin Appelman 2016-09-21 18:55:58 +07:00
parent 9754724c8b
commit f63f0aa1ae
No known key found for this signature in database
GPG Key ID: 425003AC385454C5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/files_sharing/lib/API/Share20OCS.php
Unescape Escape View File

@ -140,10 +140,14 @@ class Share20OCS extends OCSController {
$nodes = $userFolder->getById($share->getNodeId());
if (empty($nodes)) {
throw new NotFoundException();
// fallback to guessing the path
$node = $userFolder->get($share->getTarget());
if ($node === null) {
throw new NotFoundException();
}
} else {
$node = $nodes[0];
}
$node = $nodes[0];
}
$result['path'] = $userFolder->getRelativePath($node->getPath());
@ -405,8 +409,6 @@ class Share20OCS extends OCSController {
try {
$share = $this->shareManager->createShare($share);
$userFolder = $this->rootFolder->getUserFolder($this->currentUser->getUID());
$recipientNode = $userFolder->get($share->getTarget());
} catch (GenericShareException $e) {
$code = $e->getCode() === 0 ? 403 : $e->getCode();
throw new OCSException($e->getHint(), $code);
@ -416,7 +418,7 @@ class Share20OCS extends OCSController {
$share->getNode()->unlock(ILockingProvider::LOCK_SHARED);
}
$output = $this->formatShare($share, $recipientNode);
$output = $this->formatShare($share);
return new DataResponse($output);
}