]> BookStack Code Mirror - bookstack/commitdiff
Automatic Restored Revision Changelog Summary Text 2353/head
authorAnthony Ronda <redacted>
Wed, 4 Nov 2020 01:46:47 +0000 (20:46 -0500)
committerAnthony Ronda <redacted>
Wed, 4 Nov 2020 01:46:47 +0000 (20:46 -0500)
app/Entities/Repos/PageRepo.php
resources/lang/en/entities.php

index e5f13463c388f781dd215338afb4af37cefaa7c5..1467feff5bbfa399545579ab9225dad7cb703746 100644 (file)
@@ -273,9 +273,10 @@ class PageRepo
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;
-        $this->savePageRevision($page);
-
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
+        $this->savePageRevision($page, $summary);
+
         $page->fill($revision->toArray());
         $content = new PageContent($page);
         $content->setNewHTML($revision->html);
index f64867a56c31736a1730d58c51f3fe0c088364d1..6de8328afc864de3ac0fef1a72588c7d5ffb3c96 100644 (file)
@@ -208,6 +208,7 @@ return [
     'pages_revisions' => 'Page Revisions',
     'pages_revisions_named' => 'Page Revisions for :pageName',
     'pages_revision_named' => 'Page Revision for :pageName',
+    'pages_revision_restored_from' => 'Restored from #:id ":summary"',
     'pages_revisions_created_by' => 'Created By',
     'pages_revisions_date' => 'Revision Date',
     'pages_revisions_number' => '#',
Morty Proxy This is a proxified and sanitized view of the page, visit original site.