1 files changed, 6 insertions, 4 deletions
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 73b5f126984..99cc81bce04 100755
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -1,7 +1,4 @@
 <?php
-//$RUNTIME_NOAPPS = true;
-
- 
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
@@ -14,12 +11,17 @@ $users[] = "<optgroup label='Users'>";
 $groups[] = "<optgroup label='Groups'>";
 foreach ($userGroups as $group) {
 	$groupUsers = OC_Group::usersInGroup($group);
+	$userCount = 0;
 	foreach ($groupUsers as $user) {
 		if ($user != $self) {
 			$users[] = "<option value='".$user."'>".$user."</option>";
+			$userCount++;
 		}
 	}
-	$groups[] = "<option value='".$group."'>".$group."</option>";
+	// Don't include the group if only the current user is a member of it
+	if ($userCount > 0) {
+		$groups[] = "<option value='".$group."(group)'>".$group." (group) </option>";
+	}
 }
 $users[] = "</optgroup>";
 $groups[] = "</optgroup>";