Fix deleted users causes error 500

area17 · Oct 14, 2024 · 12ff193 · 12ff193
1 parent 58dc470
commit 12ff193
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Http/Controllers/Admin/DashboardController.php b/src/Http/Controllers/Admin/DashboardController.php
@@ -233,6 +233,10 @@ private function getLoggedInUserActivities(): LengthAwarePaginator
 
     private function formatActivity(Activity $activity): ?array
     {
+        if (is_null($activity->subject)) {
+            return null;
+        }
+
         if ($activity->subject_type === config('twill.auth_activity_causer', 'users')) {
             return $this->formatAuthActivity($activity);
         }
@@ -243,10 +247,6 @@ private function formatActivity(Activity $activity): ?array
             return null;
         }
 
-        if (is_null($activity->subject)) {
-            return null;
-        }
-
         if (auth('twill_users')->user()->cannot('view-item', $activity->subject)) {
             return null;
         }