NOW MANAGED ON CODEBERG
ZIP Exports: Fixed reference handling for images
Dan Browna50a256939ea
diff --git a/app/Exports/ZipExports/ZipExportReferences.php b/app/Exports/ZipExports/ZipExportReferences.phpindex b9f356a6a..b21248ffd 100644--- a/app/Exports/ZipExports/ZipExportReferences.php+++ b/app/Exports/ZipExports/ZipExportReferences.php@@ -17,17 +17,17 @@ use BookStack\Uploads\Image;class ZipExportReferences{- /** @var ZipExportPage[] */+ /** @var array<int, ZipExportPage> */protected array $pages = [];- /** @var ZipExportChapter[] */+ /** @var array<int, ZipExportChapter> */protected array $chapters = [];- /** @var ZipExportBook[] */+ /** @var array<int, ZipExportBook> */protected array $books = [];- /** @var ZipExportAttachment[] */+ /** @var array<int, ZipExportAttachment> */protected array $attachments = [];- /** @var ZipExportImage[] */+ /** @var array<int, ZipExportImage> */protected array $images = [];public function __construct(@@ -134,11 +134,12 @@ class ZipExportReferences// Find and include images if in visibility$page = $model->getPage();- if ($page && userCan('view', $page) && $exportModel instanceof ZipExportPage) {+ $pageExportModel = $this->pages[$page->id] ?? ($exportModel instanceof ZipExportPage ? $exportModel : null);+ if (isset($this->images[$model->id]) || ($page && $pageExportModel && userCan('view', $page))) {if (!isset($this->images[$model->id])) {$exportImage = ZipExportImage::fromModel($model, $files);$this->images[$model->id] = $exportImage;- $exportModel->images[] = $exportImage;+ $pageExportModel->images[] = $exportImage;}return "[[bsexport:image:{$model->id}]]";}