Avoid double encoding when not parsing html styles

This commit is contained in:
Nathan Gray 2016-04-04 20:57:01 +00:00
parent 1030461dec
commit c6501b6a88

View File

@ -1118,8 +1118,11 @@ abstract class bo_merge
}
// now decode &, < and >, which need to be encoded as entities in xml
// Check for encoded >< getting double-encoded
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')
{
$content = preg_replace_callback('/^( +)([^$\n]*)(\$\$.+?\$\$)/m', function($matches) use ($replacements)