From: Robin Appelman Date: Wed, 4 Feb 2015 16:08:03 +0000 (+0100) Subject: Dont create exclude list for generating the share target X-Git-Tag: v8.1.0alpha1~52^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2e34db2bb357c018d2ca551c6b0ec625d662918d;p=nextcloud-server.git Dont create exclude list for generating the share target --- diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php index 6059af0196d..7993498a0e8 100644 --- a/lib/private/share/helper.php +++ b/lib/private/share/helper.php @@ -44,34 +44,19 @@ class Helper extends \OC\Share\Constants { } return $backend->generateTarget($itemSource, false); } else { - if ($itemType == 'file' || $itemType == 'folder') { - $column = 'file_target'; - $columnSource = 'file_source'; - } else { - $column = 'item_target'; - $columnSource = 'item_source'; - } if ($shareType == self::SHARE_TYPE_USER) { // Share with is a user, so set share type to user and groups $shareType = self::$shareTypeUserAndGroups; } - $exclude = array(); - - $result = \OCP\Share::getItemsSharedWithUser($itemType, $shareWith); - foreach ($result as $row) { - if ($row['permissions'] > 0) { - $exclude[] = $row[$column]; - } - } // Check if suggested target exists first if (!isset($suggestedTarget)) { $suggestedTarget = $itemSource; } if ($shareType == self::SHARE_TYPE_GROUP) { - $target = $backend->generateTarget($suggestedTarget, false, $exclude); + $target = $backend->generateTarget($suggestedTarget, false); } else { - $target = $backend->generateTarget($suggestedTarget, $shareWith, $exclude); + $target = $backend->generateTarget($suggestedTarget, $shareWith); } return $target;