X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/9bd5d6a4224afb95fe2a5e1827d587b82dc23b29..refs/pull/524/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 21572db29..fd36b3158 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -158,9 +158,10 @@ class PageController extends Controller $this->checkOwnablePermission('page-view', $page); - $pageContent = $this->entityRepo->renderPage($page); + $page->html = $this->entityRepo->renderPage($page); $sidebarTree = $this->entityRepo->getBookChildren($page->book); - $pageNav = $this->entityRepo->getPageNav($pageContent); + $pageNav = $this->entityRepo->getPageNav($page->html); + $page->load(['comments.createdBy']); Views::add($page); $this->setPageTitle($page->getShortName()); @@ -440,6 +441,7 @@ class PageController extends Controller public function exportPdf($bookSlug, $pageSlug) { $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $page->html = $this->entityRepo->renderPage($page); $pdfContent = $this->exportService->pageToPdf($page); return response()->make($pdfContent, 200, [ 'Content-Type' => 'application/octet-stream', @@ -456,6 +458,7 @@ class PageController extends Controller public function exportHtml($bookSlug, $pageSlug) { $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug); + $page->html = $this->entityRepo->renderPage($page); $containedHtml = $this->exportService->pageToContainedHtml($page); return response()->make($containedHtml, 200, [ 'Content-Type' => 'application/octet-stream',