diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-10-21 16:19:54 +0200 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-10-22 11:48:29 +0200 |
commit | b7718bc212e7579ad15c51d48447ff4eca44bff6 (patch) | |
tree | 0af95178f793660bb82527498d90bcf49de42f62 /lib/private/share | |
parent | e2ff18052176278a5801e4e6638d64bc076798f1 (diff) | |
download | nextcloud-server-b7718bc212e7579ad15c51d48447ff4eca44bff6.tar.gz nextcloud-server-b7718bc212e7579ad15c51d48447ff4eca44bff6.zip |
always use the correct share type
Diffstat (limited to 'lib/private/share')
-rw-r--r-- | lib/private/share/share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index b827b84a9bc..48b1a531621 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -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 { |