X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a9b3df537f74809bff4b5ca0f7ff34bf8d2180b4..refs/pull/5293/head:/app/Entities/Tools/PageEditActivity.php diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php index ef6c085ac..646b200f1 100644 --- a/app/Entities/Tools/PageEditActivity.php +++ b/app/Entities/Tools/PageEditActivity.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Builder; class PageEditActivity { - protected $page; + protected Page $page; /** * PageEditActivity constructor. @@ -35,8 +35,14 @@ class PageEditActivity $pageDraftEdits = $this->activePageEditingQuery(60)->get(); $count = $pageDraftEdits->count(); - $userMessage = $count > 1 ? trans('entities.pages_draft_edit_active.start_a', ['count' => $count]) : trans('entities.pages_draft_edit_active.start_b', ['userName' => $pageDraftEdits->first()->createdBy->name]); - $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount'=> 60]); + $userMessage = trans('entities.pages_draft_edit_active.start_a', ['count' => $count]); + if ($count === 1) { + /** @var PageRevision $firstDraft */ + $firstDraft = $pageDraftEdits->first(); + $userMessage = trans('entities.pages_draft_edit_active.start_b', ['userName' => $firstDraft->createdBy->name ?? '']); + } + + $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount' => 60]); return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]); }