Merge pull request #18013 from nextcloud/bugfix/noid/fix-autocomplete…

…-suggestions-with-numeric-users Fix autocomplete suggestions with numeric users
nextcloud · Nov 26, 2019 · 1fac817 · 1fac817
2 parents fe6dc80 + 06f97c0
commit 1fac817
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/apps/comments/js/comments.js b/apps/comments/js/comments.js
diff --git a/apps/comments/js/comments.js.map b/apps/comments/js/comments.js.map
diff --git a/apps/comments/src/commentstabview.js b/apps/comments/src/commentstabview.js
@@ -608,7 +608,7 @@
 				$comment.find('.avatar-name-wrapper').each(function() {
 					var $this = $(this)
 					var $inserted = $this.parent()
-					var userId = $this.find('.avatar').data('username')
+					var userId = $this.find('.avatar').data('username').toString()
 					if (userId.indexOf(' ') !== -1) {
 						$inserted.html('@"' + userId + '"')
 					} else {

diff --git a/core/Controller/AutoCompleteController.php b/core/Controller/AutoCompleteController.php
@@ -107,7 +107,7 @@ protected function prepareResultArray(array $results): array {
 		foreach ($results as $type => $subResult) {
 			foreach ($subResult as $result) {
 				$output[] = [
-					'id' => $result['value']['shareWith'],
+					'id' => (string) $result['value']['shareWith'],
 					'label' => $result['label'],
 					'source' => $type,
 				];

diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -71,7 +71,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 			foreach ($userGroups as $userGroup) {
 				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $limit, $offset);
 				foreach ($usersTmp as $uid => $userDisplayName) {
-					$users[$uid] = $userDisplayName;
+					$users[(string) $uid] = $userDisplayName;
 				}
 			}
 		} else {
@@ -80,7 +80,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 
 			foreach ($usersTmp as $user) {
 				if ($user->isEnabled()) { // Don't keep deactivated users
-					$users[$user->getUID()] = $user->getDisplayName();
+					$users[(string) $user->getUID()] = $user->getDisplayName();
 				}
 			}
 		}
@@ -94,6 +94,7 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 		$foundUserById = false;
 		$lowerSearch = strtolower($search);
 		foreach ($users as $uid => $userDisplayName) {
+			$uid = (string) $uid;
 			if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
 				if (strtolower($uid) === $lowerSearch) {
 					$foundUserById = true;

diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
@@ -392,7 +392,7 @@ public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0
 
 		$matchingUsers = [];
 		foreach ($groupUsers as $groupUser) {
-			$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
+			$matchingUsers[(string) $groupUser->getUID()] = $groupUser->getDisplayName();
 		}
 		return $matchingUsers;
 	}