Docker: Fix PHP tests

[bookstack] / app / Entities / Repos / PageRepo.php

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 8840c06dba49c38d2c9058571fcb24370da1bb0f..4c59db4688bed3b3a6dcb758ea6f4ed0f1ae2f66 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -210,17 +210,17 @@ class PageRepo
         }
 
         $pageContent = new PageContent($page);
         }
 
         $pageContent = new PageContent($page);

-        if (isset($input['html'])) {
-            $pageContent->setNewHTML($input['html']);
-        } else {
+        if (!empty($input['markdown'] ?? '')) {

             $pageContent->setNewMarkdown($input['markdown']);
             $pageContent->setNewMarkdown($input['markdown']);

+        } else {
+            $pageContent->setNewHTML($input['html']);

         }
     }
 
     /**
      * Saves a page revision into the system.
      */
         }
     }
 
     /**
      * Saves a page revision into the system.
      */

-    protected function savePageRevision(Page $page, string $summary = null)
+    protected function savePageRevision(Page $page, string $summary = null): PageRevision

     {
         $revision = new PageRevision($page->getAttributes());
 
     {
         $revision = new PageRevision($page->getAttributes());
 


@@ -286,17 +286,19 @@ class PageRepo
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;

-        $this->savePageRevision($page);
-

         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();

+

         $page->fill($revision->toArray());
         $content = new PageContent($page);
         $content->setNewHTML($revision->html);
         $page->updated_by = user()->id;
         $page->refreshSlug();
         $page->save();
         $page->fill($revision->toArray());
         $content = new PageContent($page);
         $content->setNewHTML($revision->html);
         $page->updated_by = user()->id;
         $page->refreshSlug();
         $page->save();

-

         $page->indexForSearch();
         $page->indexForSearch();

+
+        $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
+        $this->savePageRevision($page, $summary);
+

         Activity::addForEntity($page, ActivityType::PAGE_RESTORE);
         return $page;
     }
         Activity::addForEntity($page, ActivityType::PAGE_RESTORE);
         return $page;
     }