TypeScript: Updated compile target, addressed issues

[bookstack] / app / Entities / Tools / PageEditActivity.php

diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php
index f23506a8c138ebb5be2e9020f8b3dd97fb0a0603..646b200f1da2ed17a3e5fb803458dabd2330a27e 100644 (file)
--- a/app/Entities/Tools/PageEditActivity.php
+++ b/app/Entities/Tools/PageEditActivity.php
@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Builder;
 
 class PageEditActivity
 {
 
 class PageEditActivity
 {

-    protected $page;
+    protected Page $page;

 
     /**
      * PageEditActivity constructor.
 
     /**
      * PageEditActivity constructor.


@@ -35,15 +35,23 @@ class PageEditActivity
         $pageDraftEdits = $this->activePageEditingQuery(60)->get();
         $count = $pageDraftEdits->count();
 
         $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]);
     }
 
     /**
      * Get any editor clash warning messages to show for the given draft revision.
 
         return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]);
     }
 
     /**
      * Get any editor clash warning messages to show for the given draft revision.

+     *

      * @param PageRevision|Page $draft
      * @param PageRevision|Page $draft

+     *

      * @return string[]
      */
     public function getWarningMessagesForDraft($draft): array
      * @return string[]
      */
     public function getWarningMessagesForDraft($draft): array