github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-29 20:06:18 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Prevent revision encoding issues

Browse Source
This commit is contained in:
Dan Brown
2015-10-18 19:40:33 +01:00
parent 8ea75b0fdf
commit 3fd2613ab7
3 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/PageController.php
View File

@ -196,13 +196,19 @@ class PageController extends Controller
return view('pages/revision', ['page' => $page, 'book' => $book]);
}
/**
* Restores a page using the content of the specified revision.
* @param $bookSlug
* @param $pageSlug
* @param $revisionId
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function restoreRevision($bookSlug, $pageSlug, $revisionId)
{
$this->checkPermission('page-update');
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$revision = $this->pageRepo->getRevisionById($revisionId);
$page = $this->pageRepo->updatePage($page, $book->id, $revision->toArray());
$page = $this->pageRepo->restoreRevision($page, $book, $revisionId);
Activity::add($page, 'page_restore', $book->id);
return redirect($page->getUrl());
}