holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing >< when merging to XML, caused by double escaping

Browse Source
This commit is contained in:
Nathan Gray 2011-12-09 21:00:57 +00:00
parent f3bbd83e0d
commit 2eee7a5119
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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('&amp;','&lt;','&gt;','',$break),$replacements);
$replacements = str_replace(array('&',"\r","\n"),array('&amp;','',$break),$replacements);
// Check for encoded >< getting double-encoded
$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);
}
return str_replace(array_keys($replacements),array_values($replacements),$content);
}