holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
nathangray 2017-02-17 08:56:37 -07:00
parent 950404b36e
commit 3c440e8885
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Storage/Merge.php
View File

@ -1040,7 +1040,7 @@ abstract class Merge
} }
} }
if(!$this->parse_html_styles || ( 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 // Encode special chars so they don't break the file