fix(wysiwyg): preserves line feeds in code block mode

[bookstack] / app / Entities / Models / Page.php

diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index fbe0db41b4cbfc48952604a6cf7827b9943585a4..c28b9a3052c6649f54ced3822e268f91990dc89d 100644 (file)
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -3,13 +3,13 @@
 namespace BookStack\Entities\Models;
 
 use BookStack\Entities\Tools\PageContent;
 namespace BookStack\Entities\Models;
 
 use BookStack\Entities\Tools\PageContent;

+use BookStack\Facades\Permissions;

 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;

-use Permissions;

 
 /**
  * Class Page.
 
 /**
  * Class Page.


@@ -64,10 +64,8 @@ class Page extends BookChild
 
     /**
      * Check if this page has a chapter.
 
     /**
      * Check if this page has a chapter.

-     *
-     * @return bool

      */
      */

-    public function hasChapter()
+    public function hasChapter(): bool

     {
         return $this->chapter()->count() > 0;
     }
     {
         return $this->chapter()->count() > 0;
     }


@@ -106,7 +104,7 @@ class Page extends BookChild
     /**
      * Get the url of this page.
      */
     /**
      * Get the url of this page.
      */

-    public function getUrl($path = ''): string
+    public function getUrl(string $path = ''): string

     {
         $parts = [
             'books',
     {
         $parts = [
             'books',