github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-22 14:49:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace GPL diff lib with MIT lib

Browse Source 
replace gpl lib with mit lib
This commit is contained in:
Younès EL BIACHE
2016-07-10 11:53:37 +02:00
parent 9537e2ae95
commit c279c6e2af
4 changed files with 158 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ use BookStack\Repos\ChapterRepo;
use BookStack\Repos\PageRepo;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Views;
use Icap\HtmlDiff\HtmlDiff;
use GatherContent\Htmldiff\Htmldiff;
class PageController extends Controller
{
@ -334,9 +334,8 @@ class PageController extends Controller
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$revision = $this->pageRepo->getRevisionById($revisionId);
$next = $revision->getNext() ?: $page;
$htmlDiff = new HtmlDiff($revision->html, $next->html, true);
$diff = $htmlDiff->outputDiff()->toString();
$next = $revision->getNext() ?: $page;
$diff = (new Htmldiff)->diff($revision->html, $next->html);
$page->fill($revision->toArray());
$this->setPageTitle('Page Revision For ' . $page->getShortName());