diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-06 09:23:44 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-06 09:23:44 +0200 |
| commit | 26b92c406c20c13cfa37e7de0dbfa06de50a4eb9 (patch) | |
| tree | 03a178d4b2fb265da023a5f9681427663ae886db /lib/private | |
| parent | 1525ef43f9a08f1da463228f9e3c7827f4a3b3c2 (diff) | |
| parent | ac5b3161e44729b746e3a365b1011156a63e8fb6 (diff) | |
| download | nextcloud-server-26b92c406c20c13cfa37e7de0dbfa06de50a4eb9.tar.gz nextcloud-server-26b92c406c20c13cfa37e7de0dbfa06de50a4eb9.zip | |
Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sharing-subfile
Make sure the share we found is for the same item
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/share/share.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 32389f34868..42fec03d3ae 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1989,6 +1989,8 @@ class Share extends Constants { $queriesToExecute = array(); $suggestedItemTarget = null; + $groupFileTarget = $fileTarget = $suggestedFileTarget = $filePath = ''; + $groupItemTarget = $itemTarget = $fileSource = $parent = 0; $result = self::checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate); if(!empty($result)) { @@ -2070,7 +2072,7 @@ class Share extends Constants { $userShareType = ($isGroupShare) ? self::$shareTypeGroupUserUnique : $shareType; - if ($sourceExists) { + if ($sourceExists && $sourceExists['item_source'] === $itemSource) { $fileTarget = $sourceExists['file_target']; $itemTarget = $sourceExists['item_target']; |