]> BookStack Code Mirror - bookstack/blobdiff - app/Http/Controllers/PageController.php
replace GPL diff lib with MIT lib
[bookstack] / app / Http / Controllers / PageController.php
index 1844e0c0c2aadadb6f60a78d12d9ef8f746cc335..fc71292e0598d72c4913beca08a6f375efd1dfff 100644 (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());