Update search.js

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 276665e52c403a3197719dde6c11e1469f596bcd..c97597bc4834822b5947eec2a3f0cc8964e3510c 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -156,12 +156,11 @@ class PageController extends Controller
             return redirect($page->getUrl());
         }
 
             return redirect($page->getUrl());
         }
 

-

         $this->checkOwnablePermission('page-view', $page);
 
         $pageContent = $this->entityRepo->renderPage($page);
         $sidebarTree = $this->entityRepo->getBookChildren($page->book);
         $this->checkOwnablePermission('page-view', $page);
 
         $pageContent = $this->entityRepo->renderPage($page);
         $sidebarTree = $this->entityRepo->getBookChildren($page->book);

-        $pageNav = $this->entityRepo->getPageNav($page);
+        $pageNav = $this->entityRepo->getPageNav($pageContent);

         
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         
         Views::add($page);
         $this->setPageTitle($page->getShortName());


@@ -370,10 +369,13 @@ class PageController extends Controller
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

-        $revision = $this->entityRepo->getById('page_revision', $revisionId, false);
+        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        if ($revision === null) {
+            abort(404);
+        }

 
         $page->fill($revision->toArray());
 
         $page->fill($revision->toArray());

-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
+        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));

         
         return view('pages/revision', [
             'page' => $page,
         
         return view('pages/revision', [
             'page' => $page,


@@ -391,7 +393,10 @@ class PageController extends Controller
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

-        $revision = $this->entityRepo->getById('page_revision', $revisionId);
+        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        if ($revision === null) {
+            abort(404);
+        }

 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;
 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;


@@ -424,7 +429,7 @@ class PageController extends Controller
     }
 
     /**
     }
 
     /**

-     * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper.
+     * Exports a page to a PDF.

      * https://github.com/barryvdh/laravel-dompdf
      * @param string $bookSlug
      * @param string $pageSlug
      * https://github.com/barryvdh/laravel-dompdf
      * @param string $bookSlug
      * @param string $pageSlug