From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 21 Oct 2014 14:19:54 +0000 (+0200)
Subject: always use the correct share type
X-Git-Tag: v7.0.3RC2~15^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=098b4e9e81b076a5b374d39793027495b051b61f;p=nextcloud-server.git

always use the correct share type
---

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 367b06c2b57..f2639fd8977 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1726,12 +1726,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;
@@ -1741,7 +1741,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 {