Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-30 20:16:04 +02:00
Code Issues Actions 42 Packages Projects Releases Wiki Activity

Do not overwrite the shareType so the post hook is still correct

Browse Source
This commit is contained in:
Joas Schilling 2015-02-09 12:59:29 +01:00
parent e2d4b3c123
commit 31b93ac19a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/share/share.php
View File

@ -1850,7 +1850,7 @@ class Share extends \OC\Share\Constants {
$sourceId = ($itemType === 'file' || $itemType === 'folder') ? $fileSource : $itemSource; $sourceId = ($itemType === 'file' || $itemType === 'folder') ? $fileSource : $itemSource;
$sourceExists = self::getItemSharedWithBySource($itemType, $sourceId, self::FORMAT_NONE, null, true, $user); $sourceExists = self::getItemSharedWithBySource($itemType, $sourceId, self::FORMAT_NONE, null, true, $user);
$shareType = ($isGroupShare) ? self::$shareTypeGroupUserUnique : $shareType; $userShareType = ($isGroupShare) ? self::$shareTypeGroupUserUnique : $shareType;
if ($sourceExists) { if ($sourceExists) {
$fileTarget = $sourceExists['file_target']; $fileTarget = $sourceExists['file_target'];
@ -1863,12 +1863,12 @@ class Share extends \OC\Share\Constants {
} elseif(!$sourceExists && !$isGroupShare) { } elseif(!$sourceExists && !$isGroupShare) {
$itemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $user, $itemTarget = Helper::generateTarget($itemType, $itemSource, $userShareType, $user,
$uidOwner, $suggestedItemTarget, $parent); $uidOwner, $suggestedItemTarget, $parent);
if (isset($fileSource)) { if (isset($fileSource)) {
if ($parentFolder) { if ($parentFolder) {
if ($parentFolder === true) { if ($parentFolder === true) {
$fileTarget = Helper::generateTarget('file', $filePath, $shareType, $user, $fileTarget = Helper::generateTarget('file', $filePath, $userShareType, $user,
$uidOwner, $suggestedFileTarget, $parent); $uidOwner, $suggestedFileTarget, $parent);
if ($fileTarget != $groupFileTarget) { if ($fileTarget != $groupFileTarget) {
$parentFolders[$user]['folder'] = $fileTarget; $parentFolders[$user]['folder'] = $fileTarget;
@ -1878,7 +1878,7 @@ class Share extends \OC\Share\Constants {
$parent = $parentFolder[$user]['id']; $parent = $parentFolder[$user]['id'];
} }
} else { } else {
$fileTarget = Helper::generateTarget('file', $filePath, $shareType, $fileTarget = Helper::generateTarget('file', $filePath, $userShareType,
$user, $uidOwner, $suggestedFileTarget, $parent); $user, $uidOwner, $suggestedFileTarget, $parent);
} }
} else { } else {
@ -1909,7 +1909,7 @@ class Share extends \OC\Share\Constants {
'itemType' => $itemType, 'itemType' => $itemType,
'itemSource' => $itemSource, 'itemSource' => $itemSource,
'itemTarget' => $itemTarget, 'itemTarget' => $itemTarget,
'shareType' => $shareType, 'shareType' => $userShareType,
'shareWith' => $user, 'shareWith' => $user,
'uidOwner' => $uidOwner, 'uidOwner' => $uidOwner,
'permissions' => $permissions, 'permissions' => $permissions,