UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update adminReportController, fix mail verification request 500 bug by changing filter precedence to catch deleted users that may still be cached in AccountService

Browse source
This commit is contained in:
Daniel Supernault 2022-05-16 02:16:23 -06:00
parent 0a7a061a83
commit 3f322e29d7
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Admin/AdminReportController.php
View file

@ -528,11 +528,14 @@ trait AdminReportController
return !in_array($id, $ignored); return !in_array($id, $ignored);
}) })
->map(function($id) { ->map(function($id) {
$account = AccountService::get($id);
$user = User::whereProfileId($id)->first(); $user = User::whereProfileId($id)->first();
if(!$user) { if(!$user) {
return []; return [];
} }
$account = AccountService::get($id);
if(!$account) {
return [];
}
$account['email'] = $user->email; $account['email'] = $user->email;
return $account; return $account;
}) })