mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
Avoid double encoding when not parsing html styles
This commit is contained in:
parent
1030461dec
commit
c6501b6a88
@ -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",'&lt;','&gt;'),array('&','',$break,'<','>'),$replacements);
|
||||
}
|
||||
}
|
||||
if ($mimetype == 'application/x-yaml')
|
||||
{
|
||||
$content = preg_replace_callback('/^( +)([^$\n]*)(\$\$.+?\$\$)/m', function($matches) use ($replacements)
|
||||
|
Loading…
Reference in New Issue
Block a user