2 files changed, 20 insertions, 0 deletions
diff --git a/lib/private/Collaboration/Collaborators/Search.php b/lib/private/Collaboration/Collaborators/Search.php
index e9b15dd1201..0e856eeb6f1 100644
--- a/lib/private/Collaboration/Collaborators/Search.php
+++ b/lib/private/Collaboration/Collaborators/Search.php
@@ -40,6 +40,15 @@ class Search implements ISearch {
 		$this->c = $c;
 	}
 
+	/**
+	 * @param $search
+	 * @param array $shareTypes
+	 * @param $lookup
+	 * @param $limit
+	 * @param $offset
+	 * @return array
+	 * @throws \OCP\AppFramework\QueryException
+	 */
 	public function search($search, array $shareTypes, $lookup, $limit, $offset) {
 		$hasMoreResults = false;
 
diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
index 86a55aa428f..ad677703547 100644
--- a/lib/private/Collaboration/Collaborators/UserPlugin.php
+++ b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -83,6 +83,8 @@ class UserPlugin implements ISearchPlugin {
 			}
 		}
 
+		$this->takeOutCurrentUser($users);
+
 		if (!$this->shareeEnumeration || sizeof($users) < $limit) {
 			$hasMoreResults = true;
 		}
@@ -146,4 +148,13 @@ class UserPlugin implements ISearchPlugin {
 
 		return $hasMoreResults;
 	}
+
+	public function takeOutCurrentUser(array &$users) {
+		$currentUser = $this->userSession->getUser();
+		if(!is_null($currentUser)) {
+			if (isset($users[$currentUser->getUID()])) {
+				unset($users[$currentUser->getUID()]);
+			}
+		}
+	}
 }