extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid double encoding when not parsing html styles

Browse Source
This commit is contained in:
Nathan Gray 2016-04-04 20:57:01 +00:00
parent 1030461dec
commit c6501b6a88
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.bo_merge.inc.php
View File

@ -1118,7 +1118,10 @@ abstract class bo_merge
} }
// now decode &, < and >, which need to be encoded as entities in xml // now decode &, < and >, which need to be encoded as entities in xml
// Check for encoded >< getting double-encoded // Check for encoded >< getting double-encoded
$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements); if($this->parse_html_styles)
{
$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);
}
} }
if ($mimetype == 'application/x-yaml') if ($mimetype == 'application/x-yaml')
{ {