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

always use the correct share type

remotes/origin/fix-10825
Bjoern Schiessle 2014-10-21 16:19:54 +07:00
parent e2ff180521
commit b7718bc212
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/share/share.php
Unescape Escape View File

@ -1781,12 +1781,12 @@ class Share extends \OC\Share\Constants {
} elseif(!$sourceExists && !$isGroupShare) {
$itemTarget = Helper::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $user,
$itemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $user,
$uidOwner, $suggestedItemTarget, $parent);
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
$fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $user,
$fileTarget = Helper::generateTarget('file', $filePath, $shareType, $user,
$uidOwner, $suggestedFileTarget, $parent);
if ($fileTarget != $groupFileTarget) {
$parentFolders[$user]['folder'] = $fileTarget;
@ -1796,7 +1796,7 @@ class Share extends \OC\Share\Constants {
$parent = $parentFolder[$user]['id'];
}
} else {
$fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
$fileTarget = Helper::generateTarget('file', $filePath, $shareType,
$user, $uidOwner, $suggestedFileTarget, $parent);
}
} else {