]> source.dussan.org Git - nextcloud-server.git/commitdiff
Dont create exclude list for generating the share target
authorRobin Appelman <icewind@owncloud.com>
Wed, 4 Feb 2015 16:08:03 +0000 (17:08 +0100)
committerRobin Appelman <icewind@owncloud.com>
Wed, 4 Feb 2015 16:08:03 +0000 (17:08 +0100)
lib/private/share/helper.php

index 6059af0196d9ea152978856cfa386ffec77cbb15..7993498a0e8d1e644d5a40c46d1da80e91de5bee 100644 (file)
@@ -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;