diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-27 14:40:52 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-27 14:40:52 +0100 |
| commit | e918bcf2127a727f401f116625b2ea81978d6fdd (patch) | |
| tree | 44f7399f6d66c5a0406e01fcf2cd0d3f8cec23d2 | |
| parent | 0ecc1c89ad77341c3d178fe4d393b3207849fb60 (diff) | |
| parent | 223cca2a0742ce4b506a61ae47b03b9a2af0a926 (diff) | |
| download | nextcloud-server-e918bcf2127a727f401f116625b2ea81978d6fdd.tar.gz nextcloud-server-e918bcf2127a727f401f116625b2ea81978d6fdd.zip | |
Merge pull request #15247 from owncloud/fix_group_share_master_backport
also call generateTarget for group shares
| -rw-r--r-- | lib/private/share/share.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index aeb9a9a4767..dc0b2f6c5bf 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1825,9 +1825,10 @@ class Share extends \OC\Share\Constants { if (in_array(\OCP\User::getUser(), $users)) { unset($users[array_search(\OCP\User::getUser(), $users)]); } - $groupItemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'], - $uidOwner, $suggestedItemTarget); - $groupFileTarget = $filePath; + $groupItemTarget = Helper::generateTarget($itemType, $itemSource, + $shareType, $shareWith['group'], $uidOwner, $suggestedItemTarget); + $groupFileTarget = Helper::generateTarget($itemType, $itemSource, + $shareType, $shareWith['group'], $uidOwner, $filePath); // add group share to table and remember the id as parent $queriesToExecute['groupShare'] = array( @@ -1840,7 +1841,7 @@ class Share extends \OC\Share\Constants { 'permissions' => $permissions, 'shareTime' => time(), 'fileSource' => $fileSource, - 'fileTarget' => $filePath, + 'fileTarget' => $groupFileTarget, 'token' => $token, 'parent' => $parent, 'expiration' => $expirationDate, |