diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-10-21 18:19:54 +0400 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-10-21 18:19:54 +0400 |
| commit | 098b4e9e81b076a5b374d39793027495b051b61f (patch) | |
| tree | 082c11856e7a6883afab6e7cc3d046ea4891ef4e /lib/private/share | |
| parent | d0b3fe2414a553f3b6b1d4bc8dbb937a732a18db (diff) | |
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 367b06c2b57..f2639fd8977 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1726,12 +1726,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; @@ -1741,7 +1741,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 { |