summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-03-20 15:51:25 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2015-03-20 15:51:25 +0100
commitdf2f85ee01b3b589728833b8c6d2b078935b7e9e (patch)
tree84f027ad728e742476f1abd9601d423ce3fd4dc9 /lib/private
parent234f33e01e630f763f34c51114d25986bae02b42 (diff)
downloadnextcloud-server-df2f85ee01b3b589728833b8c6d2b078935b7e9e.tar.gz
nextcloud-server-df2f85ee01b3b589728833b8c6d2b078935b7e9e.zip
also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
Diffstat (limited to 'lib/private')
-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 be113568a3b..5f8f82bd77e 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1678,7 +1678,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(
@@ -1691,7 +1692,7 @@ class Share extends \OC\Share\Constants {
'permissions' => $permissions,
'shareTime' => time(),
'fileSource' => $fileSource,
- 'fileTarget' => $filePath,
+ 'fileTarget' => $groupFileTarget,
'token' => $token,
'parent' => $parent,
'expiration' => $expirationDate,