From 588862d150c6e23128d57446b8430cd9e36df434 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 28 Jul 2016 14:14:20 -0600
Subject: [PATCH] Slightly more intelligent detection of plain text fields in a
 document that has HTML parsing turned on

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

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 35bdf100df..3d6092d002 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1039,8 +1039,9 @@ abstract class Merge
 						$value = preg_replace('/&[^; ]+;/','',$value);
 					}
 				}
-
-				if(!$this->parse_html_styles)
+				if(!$this->parse_html_styles || (
+					strpos($value, "\n") !== FALSE && strpos($value,'<br') === FALSE && strpos($value, '<span') === FALSE
+				))
 				{
 					// Encode special chars so they don't break the file
 					$value = htmlspecialchars($value,ENT_NOQUOTES);