From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 20 Mar 2015 14:51:25 +0000 (+0100)
Subject: also call generateTarget for group share to add the correct prefix if share_folder... 
X-Git-Tag: v7.0.6RC1~16^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df2f85ee01b3b589728833b8c6d2b078935b7e9e;p=nextcloud-server.git

also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
---

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,