[Pkg-owncloud-commits] [owncloud] 18/78: also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit df2f85ee01b3b589728833b8c6d2b078935b7e9e
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Fri Mar 20 15:51:25 2015 +0100

    also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
---
 lib/private/share/share.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index be11356..5f8f82b 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git