From ce94f07599aa7f32d12e2850642f16a80ac4b986 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 11 Apr 2016 15:21:16 +0000
Subject: [PATCH] Fix missing line breaks when merging entries that do not need
 HTML processing

---
 api/src/Storage/Merge.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index ceba5e6224..cc87d4c55d 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1132,6 +1132,11 @@ abstract class Merge
 			{
 				$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);
 			}
+			else
+			{
+				// Need to at least handle new lines, or it'll be run together on one line
+				$replacements = str_replace(array("\r","\n"),array('',$break),$replacements);
+			}
 		}
 		if ($mimetype == 'application/x-yaml')
 		{