extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues 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 48d2664c71
commit 4d0419f5b4
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

@ -1042,7 +1042,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