From 3c440e8885b49f2d451b21f8a610dd4c5a6018fd Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 17 Feb 2017 08:56:37 -0700
Subject: [PATCH] Allow <p> tag to enable HTML parsing as well as <br> and
 <span>, fixes using p for line breaks and no other formatting resulted in
 unparsed HTML when merging.

---
 api/src/Storage/Merge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 9b7bd7ad67..6019a802fb 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1040,7 +1040,7 @@ abstract class Merge
 					}
 				}
 				if(!$this->parse_html_styles || (
-					strpos($value, "\n") !== FALSE && strpos($value,'<br') === FALSE && strpos($value, '<span') === FALSE
+					strpos($value, "\n") !== FALSE && strpos($value,'<br') === FALSE && strpos($value, '<span') === FALSE && strpos($value, '<p') === FALSE
 				))
 				{
 					// Encode special chars so they don't break the file