[Pkg-owncloud-commits] [owncloud] 104/118: 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 stable8
in repository owncloud.

commit 893cbc917d2b497f4586b295a484e76e1264894e
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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 229dbc5..0069d70 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1803,9 +1803,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(
@@ -1818,7 +1819,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