Fix email verification requests filtering to gracefully handle deleted accounts and accounts already verified

3 years ago · b57066d15d
parent 872f5f879b
commit b57066d15d
1 changed files with 2 additions and 2 deletions
--- a/app/Http/Controllers/Admin/AdminReportController.php
+++ b/app/Http/Controllers/Admin/AdminReportController.php
@ -560,10 +560,10 @@ trait AdminReportController
 				})
 				->map(function($id) {
 					$user = User::whereProfileId($id)->first();
-					if(!$user) {
+					if(!$user || $user->email_verified_at) {
 						return [];
 					}
-					$account = AccountService::get($id);
+					$account = AccountService::get($id, true);
 					if(!$account) {
 						return [];
 					}