summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-06-25 13:21:01 -0400
committerBart Visscher <bartv@thisnet.nl>2012-06-27 01:05:36 +0200
commit9fdfcc29febe4ae7d1f8f056878cd04f5596f1e0 (patch)
treeadcd3444f85baabfced98a5d3b36a507e89c3f67
parentb9e1033563b534faa75b0e0562f441b4eaf83a7d (diff)
downloadnextcloud-server-9fdfcc29febe4ae7d1f8f056878cd04f5596f1e0.tar.gz
nextcloud-server-9fdfcc29febe4ae7d1f8f056878cd04f5596f1e0.zip
Fix group sharing
-rw-r--r--lib/public/share.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/public/share.php b/lib/public/share.php
index 0a76bf6520a..7982f78e433 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -170,7 +170,7 @@ class Share {
$group = $shareWith;
$shareWith = array();
$shareWith['group'] = $group;
- $shareWith['users'] = array_diff(\OC_Group::usersInGroup($shareWith), array($uidOwner));
+ $shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
break;
case self::SHARETYPE_PRIVATE_LINK:
// TODO don't loop through folder conversion
@@ -567,7 +567,7 @@ class Share {
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
- $fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+ $fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
if ($fileTarget != $groupFileTarget) {
$parentFolders[$uid]['folder'] = $fileTarget;
}
@@ -576,7 +576,7 @@ class Share {
$parent = $parentFolder[$uid]['id'];
}
} else {
- $fileTarget = self::getBackend('file')->generateTarget($source['file'], $uidSharedWith);
+ $fileTarget = self::getBackend('file')->generateTarget($source['file'], $uid);
}
} else {
$fileTarget = null;