Closes #69. Implemented and tested memcached.

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

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 2dbdb81e787c7889e0d04008929d9d81caebf643..e78ae13e4c2972067ef9ed4232f6771426ab852d 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -11,6 +11,7 @@ use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;
 use BookStack\Repos\ChapterRepo;
 use BookStack\Repos\PageRepo;
 use BookStack\Repos\BookRepo;
 use BookStack\Repos\ChapterRepo;
 use BookStack\Repos\PageRepo;

+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 use Views;
 
 class PageController extends Controller
 use Views;
 
 class PageController extends Controller


@@ -81,6 +82,8 @@ class PageController extends Controller
 
     /**
      * Display the specified page.
 
     /**
      * Display the specified page.

+     * If the page is not found via the slug the
+     * revisions are searched for a match.

      *
      * @param $bookSlug
      * @param $pageSlug
      *
      * @param $bookSlug
      * @param $pageSlug


@@ -89,7 +92,15 @@ class PageController extends Controller
     public function show($bookSlug, $pageSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
     public function show($bookSlug, $pageSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);

-        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+
+        try {
+            $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        } catch (NotFoundHttpException $e) {
+            $page = $this->pageRepo->findPageUsingOldSlug($pageSlug, $bookSlug);
+            if ($page === null) abort(404);
+            return redirect($page->getUrl());
+        }
+

         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($page);
         $this->setPageTitle($page->getShortName());
         $sidebarTree = $this->bookRepo->getChildren($book);
         Views::add($page);
         $this->setPageTitle($page->getShortName());