mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:20 +01:00
Fix missing >< when merging to XML, caused by double escaping
This commit is contained in:
parent
f3bbd83e0d
commit
2eee7a5119
@ -931,8 +931,8 @@ abstract class bo_merge
|
||||
break;
|
||||
}
|
||||
// now decode &, < and >, which need to be encoded as entities in xml
|
||||
//$replacements = str_replace(array('&','<','>',"\r","\n"),array('&','<','>','',$break),$replacements);
|
||||
$replacements = str_replace(array('&',"\r","\n"),array('&','',$break),$replacements);
|
||||
// Check for encoded >< getting double-encoded
|
||||
$replacements = str_replace(array('&',"\r","\n",'&lt;','&gt;'),array('&','',$break,'<','>'),$replacements);
|
||||
}
|
||||
return str_replace(array_keys($replacements),array_values($replacements),$content);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user