From: Dan Brown <redacted>
Date: Fri, 18 Dec 2020 14:16:13 +0000 (+0000)
Subject: Merge branch 'v0.30.x'
X-Git-Tag: v0.31.0~3^2~20
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/cf04a0d818b7c973ad20a7a49308629c738ca73d?hp=-c

Merge branch 'v0.30.x'
---

cf04a0d818b7c973ad20a7a49308629c738ca73d
diff --combined app/Entities/Tools/ExportFormatter.php
index 9cf8b56af,508670c85..eb8f6862f
--- a/app/Entities/Tools/ExportFormatter.php
+++ b/app/Entities/Tools/ExportFormatter.php
@@@ -1,15 -1,14 +1,15 @@@
 -<?php namespace BookStack\Entities;
 +<?php namespace BookStack\Entities\Tools;
  
 -use BookStack\Entities\Managers\BookContents;
 -use BookStack\Entities\Managers\PageContent;
 +use BookStack\Entities\Models\Book;
 +use BookStack\Entities\Models\Chapter;
 +use BookStack\Entities\Models\Page;
  use BookStack\Uploads\ImageService;
  use DomPDF;
  use Exception;
  use SnappyPDF;
  use Throwable;
  
 -class ExportService
 +class ExportFormatter
  {
  
      protected $imageService;
@@@ -143,7 -142,7 +143,7 @@@
      protected function containHtml(string $htmlContent): string
      {
          $imageTagsOutput = [];
 -        preg_match_all("/\<img.*src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
 +        preg_match_all("/\<img.*?src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
  
          // Replace image src with base64 encoded image strings
          if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {
@@@ -204,7 -203,7 +204,7 @@@
      {
          $text = $chapter->name . "\n\n";
          $text .= $chapter->description . "\n\n";
-         foreach ($chapter->pages as $page) {
+         foreach ($chapter->getVisiblePages() as $page) {
              $text .= $this->pageToPlainText($page);
          }
          return $text;
@@@ -215,7 -214,7 +215,7 @@@
       */
      public function bookToPlainText(Book $book): string
      {
-         $bookTree = (new BookContents($book))->getTree(false, true);
+         $bookTree = (new BookContents($book))->getTree(false, false);
          $text = $book->name . "\n\n";
          foreach ($bookTree as $bookChild) {
              if ($bookChild->isA('chapter')) {
diff --combined app/Uploads/ImageRepo.php
index 087fe67c9,fb2a89228..b4d743b73
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@@ -1,7 -1,7 +1,7 @@@
  <?php namespace BookStack\Uploads;
  
  use BookStack\Auth\Permissions\PermissionService;
 -use BookStack\Entities\Page;
 +use BookStack\Entities\Models\Page;
  use BookStack\Exceptions\ImageUploadException;
  use Exception;
  use Illuminate\Database\Eloquent\Builder;
@@@ -112,7 -112,7 +112,7 @@@ class ImageRep
                  if ($filterType === 'page') {
                      $query->where('uploaded_to', '=', $contextPage->id);
                  } elseif ($filterType === 'book') {
-                     $validPageIds = $contextPage->book->pages()->get(['id'])->pluck('id')->toArray();
+                     $validPageIds = $contextPage->book->pages()->visible()->get(['id'])->pluck('id')->toArray();
                      $query->whereIn('uploaded_to', $validPageIds);
                  }
              };