From 988f153d9fe4485a5bb35b7c42b0e421e0a31bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Tue, 25 Oct 2016 19:55:07 +0200
Subject: [PATCH] FEATURE: add line breaks into diff

---
 app/CMS/Interactions/Admin/Content/UploadRelatedFiles.php | 0
 app/CMS/Interactions/Admin/Content/UploadTitlePhoto.php   | 0
 app/Models/Content/ModelTraits/ContentHistory.php         | 2 +-
 resources/views/admin/history/diff.blade.php              | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 app/CMS/Interactions/Admin/Content/UploadRelatedFiles.php
 delete mode 100644 app/CMS/Interactions/Admin/Content/UploadTitlePhoto.php

diff --git a/app/CMS/Interactions/Admin/Content/UploadRelatedFiles.php b/app/CMS/Interactions/Admin/Content/UploadRelatedFiles.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/CMS/Interactions/Admin/Content/UploadTitlePhoto.php b/app/CMS/Interactions/Admin/Content/UploadTitlePhoto.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/Models/Content/ModelTraits/ContentHistory.php b/app/Models/Content/ModelTraits/ContentHistory.php
index 84f58489..7e1f2fbd 100644
--- a/app/Models/Content/ModelTraits/ContentHistory.php
+++ b/app/Models/Content/ModelTraits/ContentHistory.php
@@ -78,6 +78,6 @@ trait ContentHistory
 
     public function getDiff($change)
     {
-        return Differ::htmlDiff(e($change->old_value), e($change->new_value));
+        return Differ::htmlDiff(nl2br(e($change->old_value)), nl2br(e($change->new_value)));
     }
 }
\ No newline at end of file
diff --git a/resources/views/admin/history/diff.blade.php b/resources/views/admin/history/diff.blade.php
index 1ba33434..28846f9e 100644
--- a/resources/views/admin/history/diff.blade.php
+++ b/resources/views/admin/history/diff.blade.php
@@ -12,7 +12,7 @@
             </div>
         </div>
         <div class="card-block">
-            {!! $diff !!}
+            {!! nl2br($diff) !!}
         </div>
     </div>