summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-03-26 22:24:42 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-03-26 22:24:42 +0100
commit32bd2d15e31b7947c269a7dc9641f29ce5e2714f (patch)
tree82273b3ea389c14bcc7554785973a8ae7d819cd5 /lib
parentef1ddfc5dba46b0436bc081360d3d47a131215a1 (diff)
parentdf2f85ee01b3b589728833b8c6d2b078935b7e9e (diff)
downloadnextcloud-server-32bd2d15e31b7947c269a7dc9641f29ce5e2714f.tar.gz
nextcloud-server-32bd2d15e31b7947c269a7dc9641f29ce5e2714f.zip
Merge pull request #15072 from owncloud/fix_group_share
also call generateTarget for group shares
Diffstat (limited to 'lib')
-rw-r--r--lib/private/share/share.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 9dc831dd37f..69a01564ac3 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1685,7 +1685,8 @@ class Share extends \OC\Share\Constants {
}
$groupItemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
$uidOwner, $suggestedItemTarget);
- $groupFileTarget = $filePath;
+ $groupFileTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
+ $uidOwner, $filePath);
// add group share to table and remember the id as parent
$queriesToExecute['groupShare'] = array(
@@ -1698,7 +1699,7 @@ class Share extends \OC\Share\Constants {
'permissions' => $permissions,
'shareTime' => time(),
'fileSource' => $fileSource,
- 'fileTarget' => $filePath,
+ 'fileTarget' => $groupFileTarget,
'token' => $token,
'parent' => $parent,
'expiration' => $expirationDate,