Merge pull request #2607 from drgrice1/user-list-warnings

Fix warnings that occur when the Accounts Manager page is loaded.
openwebwork · Oct 29, 2024 · dd844c7 · dd844c7
2 parents 6a0f21e + fba8dfd
commit dd844c7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -236,9 +236,16 @@ sub pre_header_initialize ($c) {
 
 	# Always have a definite sort order in case the first three sorts don't determine things.
 	$c->{sortedUserIDs} = [
-		map  { $_->user_id }
-		sort { &$primarySortSub || &$secondarySortSub || &$ternarySortSub || byLastName || byFirstName || byUserID }
-		grep { $c->{visibleUserIDs}{ $_->user_id } } (values %allUsers)
+		map { $_->user_id }
+			sort {
+				$primarySortSub->()
+				|| $secondarySortSub->()
+				|| $ternarySortSub->()
+				|| byLastName()
+				|| byFirstName()
+				|| byUserID()
+		}
+			grep { $c->{visibleUserIDs}{ $_->user_id } } (values %allUsers)
 	];
 
 	return;