diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-03-20 15:51:25 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-03-26 22:31:45 +0100 |
| commit | 223cca2a0742ce4b506a61ae47b03b9a2af0a926 (patch) | |
| tree | caadd89a8cc36318f9ad6d6c205d88e830669061 /lib | |
| parent | 4c00be49613fe14a03e996dd0768bcb7ef2795ab (diff) | |
| download | nextcloud-server-223cca2a0742ce4b506a61ae47b03b9a2af0a926.tar.gz nextcloud-server-223cca2a0742ce4b506a61ae47b03b9a2af0a926.zip | |
also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
Diffstat (limited to 'lib')
| -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, |