diff options
author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-20 14:17:25 +0100 |
---|---|---|
committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-21 16:06:12 +0100 |
commit | 3a582e88e599d53108bcd7a299a56202513f3bd5 (patch) | |
tree | a742091972963d9aeb625b9bb7d4230be30e3042 /apps | |
parent | 9b5ea18ce56fef3de8403be97e0961dc7a082370 (diff) | |
download | nextcloud-server-3a582e88e599d53108bcd7a299a56202513f3bd5.tar.gz nextcloud-server-3a582e88e599d53108bcd7a299a56202513f3bd5.zip |
Comments from Vincent
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_sharing/api/share20ocs.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php index 2190582f3f4..c2ff94db790 100644 --- a/apps/files_sharing/api/share20ocs.php +++ b/apps/files_sharing/api/share20ocs.php @@ -330,7 +330,6 @@ class Share20OCS { private function getSharedWithMe() { $userShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_USER, -1, 0); $groupShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, -1, 0); - //TODO add federated provider $shares = array_merge($userShares, $groupShares); @@ -355,12 +354,11 @@ class Share20OCS { /** @var IShare[] $shares */ $shares = []; foreach ($nodes as $node) { - $userShares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0)); - $groupShares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0)); - $linkShares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0)); + $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0)); + $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0)); + $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0)); //TODO: Add federated shares - $shares = array_merge($shares, $userShares, $groupShares, $linkShares); } $formatted = []; |