X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/2ed031712918313b50483d22cf6735aed227dc06..refs/pull/2283/head:/app/Actions/ActivityService.php diff --git a/app/Actions/ActivityService.php b/app/Actions/ActivityService.php index e6b004f01..4e5b1f365 100644 --- a/app/Actions/ActivityService.php +++ b/app/Actions/ActivityService.php @@ -3,6 +3,7 @@ use BookStack\Auth\Permissions\PermissionService; use BookStack\Auth\User; use BookStack\Entities\Entity; +use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; @@ -104,7 +105,9 @@ class ActivityService $activity = $this->permissionService ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type') ->orderBy('created_at', 'desc') - ->with(['entity', 'user.avatar']) + ->with(['entity' => function (Relation $query) { + $query->withTrashed(); + }, 'user.avatar']) ->skip($count * ($page - 1)) ->take($count) ->get();