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

[bookstack] / resources / views / pages / page-display.blade.php

diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php
index 2ddd4e0d8e38830fd0ce9a7375bac5b947e7f358..6ffe4b50237209d6f07e5683be265a1e3f4fd0ce 100644 (file)
--- 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>
\ No newline at end of file