]> source.dussan.org Git - nextcloud-server.git/commitdiff
also call generateTarget for group share to add the correct prefix if share_folder...
authorBjoern Schiessle <schiessle@owncloud.com>
Fri, 20 Mar 2015 14:51:25 +0000 (15:51 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Thu, 26 Mar 2015 21:31:45 +0000 (22:31 +0100)
lib/private/share/share.php

index aeb9a9a47675b26f6d86e5cb7f8cd409b3797bc0..dc0b2f6c5bff5ce3e041333ddc2942366c29b4c4 100644 (file)
@@ -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,