fix: reduce memory consumption while loading users

pressbooks · Jul 18, 2024 · 636a6e6 · 636a6e6
1 parent 64e6773
commit 636a6e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/resources/views/institutions/form.blade.php b/resources/views/institutions/form.blade.php
@@ -206,7 +206,7 @@ class="regular-text"
 								@else
 									<option
 										value="{{ $user->ID }}"
-										@if($institution->managers->contains(fn (object $institutionUser) => $institutionUser->user_id === $user->ID)))
+										@if($institution->managers->contains(fn (object $institutionUser) => $institutionUser->user_id === (int) $user->ID)))
 										selected
 										@endif
 									>

diff --git a/src/Controllers/InstitutionsController.php b/src/Controllers/InstitutionsController.php
@@ -13,8 +13,6 @@
 use PressbooksMultiInstitution\Views\InstitutionsTable;
 use PressbooksMultiInstitution\Views\InstitutionsTotals;
 use PressbooksMultiInstitution\Support\ConvertEmptyStringsToNull;
-use stdClass;
-use WP_User;
 
 use function Pressbooks\Admin\NetworkManagers\is_restricted;
 
@@ -272,7 +270,7 @@ protected function fetchUsers(?Institution $institution): array
             ->pluck('ID')
             ->toArray();
 
-        $users = get_users([
+        return get_users([
             'blog_id' => 0, // all users from the network
             'fields' => ['ID', 'display_name', 'user_email'],
             'orderby' => [
@@ -282,8 +280,6 @@ protected function fetchUsers(?Institution $institution): array
             ],
             'exclude' => $usersToSkip
         ]);
-
-        return array_map(fn (stdClass $value) => new WP_User($value), $users);
     }
 
     protected function checkForInvalidDomains(array $domains): array