diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-10-06 18:13:11 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-10-06 18:13:11 -0400 |
| commit | 5f462ec6f71b82ec334aeef402d98ed7207dcbd7 (patch) | |
| tree | 6c40375398e86770fc44e635ae2afbe64ad6a009 /lib/public | |
| parent | 5eaf95eedd842c3978173f75db1db68253dc1bc7 (diff) | |
| download | nextcloud-server-5f462ec6f71b82ec334aeef402d98ed7207dcbd7.tar.gz nextcloud-server-5f462ec6f71b82ec334aeef402d98ed7207dcbd7.zip | |
Fix - "Correct checking item source for share from same owner when generating item target"
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index e0488b8faf6..59dbad035aa 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -1015,8 +1015,14 @@ class Share { continue;
}
}
- if ($item['uid_owner'] == $uidOwner && $item[$columnSource] == $itemSource) {
- return $target;
+ if ($item['uid_owner'] == $uidOwner) {
+ if ($itemType == 'file' || $itemType == 'folder') {
+ if ($item['file_source'] == \OC_FileCache::getId($itemSource)) {
+ return $target;
+ }
+ } else if ($item['item_source'] == $itemSource) {
+ return $target;
+ }
}
}
if (!isset($exclude)) {
|