diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-04-23 14:13:40 +0200 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-04-23 14:13:40 +0200 |
| commit | 4aa80d02beac84c332ab08b65bd6eb5590e29508 (patch) | |
| tree | 08de1d89d2eee65b9e3f574eff781784293318a0 /lib/public | |
| parent | a1d241783ee44529fac99ba25cb34b658f827876 (diff) | |
| parent | 05ab9d2de7f2c5181eda2174a2e2adb1cc214196 (diff) | |
| download | nextcloud-server-4aa80d02beac84c332ab08b65bd6eb5590e29508.tar.gz nextcloud-server-4aa80d02beac84c332ab08b65bd6eb5590e29508.zip | |
Merge branch 'master' into files_encryption
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 5cd556c6acb..e0aedf35694 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -777,6 +777,7 @@ class Share { } } $backend = self::getBackend($itemType); + $collectionTypes = false; // Get filesystem root to add it to the file target and remove from the // file source, match file_source with the file cache if ($itemType == 'file' || $itemType == 'folder') { @@ -1261,7 +1262,7 @@ class Share { 'itemTarget' => $groupItemTarget, 'parent' => $parent, 'shareType' => $shareType, - 'shareWith' => $uid, + 'shareWith' => $shareWith['group'], 'uidOwner' => $uidOwner, 'permissions' => $permissions, 'fileSource' => $fileSource, |