always use the correct share type

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b827b84a9bc5552bd79136aea5fe806ba4853f65..48b1a53162109b3f732cfec0a9fde8b5688cdab6 100644 (file)
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1781,12 +1781,12 @@ class Share extends \OC\Share\Constants {
 
                        } elseif(!$sourceExists && !$isGroupShare)  {
 
-                               $itemTarget = Helper::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $user,
+                               $itemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $user,
                                        $uidOwner, $suggestedItemTarget, $parent);
                                if (isset($fileSource)) {
                                        if ($parentFolder) {
                                                if ($parentFolder === true) {
-                                                       $fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $user,
+                                                       $fileTarget = Helper::generateTarget('file', $filePath, $shareType, $user,
                                                                $uidOwner, $suggestedFileTarget, $parent);
                                                        if ($fileTarget != $groupFileTarget) {
                                                                $parentFolders[$user]['folder'] = $fileTarget;
@@ -1796,7 +1796,7 @@ class Share extends \OC\Share\Constants {
                                                        $parent = $parentFolder[$user]['id'];
                                                }
                                        } else {
-                                               $fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
+                                               $fileTarget = Helper::generateTarget('file', $filePath, $shareType,
                                                        $user, $uidOwner, $suggestedFileTarget, $parent);
                                        }
                                } else {