Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff

2025-08-07 23:03:00 +03:00 · 2016-09-29 09:32:40 +01:00
parent 42d8e9e5bd c279c6e2af
commit fff5bbcee4
6 changed files with 219 additions and 54 deletions
--- a/resources/views/pages/page-display.blade.php
+++ b/resources/views/pages/page-display.blade.php
@@ -24,5 +24,9 @@

    <div style="clear:left;"></div>

-    {!! $page->html !!}
+    @if (isset($diff) && $diff)
+        {!! $diff !!}
+    @else
+        {!! $page->html !!}
+    @endif
 </div>