Skip intermediate login page with single provider

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

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 828c4572fd100f7355d02077477a85a8728bc216..c106d2fd30679d6f663cdd845ddbaf1b0aee4fe5 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -10,6 +10,7 @@ use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;

+use BookStack\Entities\Tools\PageEditorData;

 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;


@@ -217,11 +218,25 @@ class PageRepo
         }
 
         $pageContent = new PageContent($page);
         }
 
         $pageContent = new PageContent($page);

-        if (!empty($input['markdown'] ?? '')) {
+        $currentEditor = $page->editor ?: PageEditorData::getSystemDefaultEditor();
+        $newEditor = $currentEditor;
+
+        $haveInput = isset($input['markdown']) || isset($input['html']);
+        $inputEmpty = empty($input['markdown']) && empty($input['html']);
+
+        if ($haveInput && $inputEmpty) {
+            $pageContent->setNewHTML('');
+        } elseif (!empty($input['markdown']) && is_string($input['markdown'])) {
+            $newEditor = 'markdown';

             $pageContent->setNewMarkdown($input['markdown']);
         } elseif (isset($input['html'])) {
             $pageContent->setNewMarkdown($input['markdown']);
         } elseif (isset($input['html'])) {

+            $newEditor = 'wysiwyg';

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

+
+        if ($newEditor !== $currentEditor && userCan('editor-change')) {
+            $page->editor = $newEditor;
+        }

     }
 
     /**
     }
 
     /**


@@ -229,8 +244,12 @@ class PageRepo
      */
     protected function savePageRevision(Page $page, string $summary = null): PageRevision
     {
      */
     protected function savePageRevision(Page $page, string $summary = null): PageRevision
     {

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

 
 

+        $revision->name = $page->name;
+        $revision->html = $page->html;
+        $revision->markdown = $page->markdown;
+        $revision->text = $page->text;

         $revision->page_id = $page->id;
         $revision->slug = $page->slug;
         $revision->book_slug = $page->book->slug;
         $revision->page_id = $page->id;
         $revision->slug = $page->slug;
         $revision->book_slug = $page->book->slug;


@@ -260,10 +279,15 @@ class PageRepo
             return $page;
         }
 
             return $page;
         }
 

-        // Otherwise save the data to a revision
+        // Otherwise, save the data to a revision

         $draft = $this->getPageRevisionToUpdate($page);
         $draft->fill($input);
         $draft = $this->getPageRevisionToUpdate($page);
         $draft->fill($input);

-        if (setting('app-editor') !== 'markdown') {
+
+        if (!empty($input['markdown'])) {
+            $draft->markdown = $input['markdown'];
+            $draft->html = '';
+        } else {
+            $draft->html = $input['html'];

             $draft->markdown = '';
         }
 
             $draft->markdown = '';
         }