Fix double encoded & in merge functions

This commit is contained in:
Nathan Gray 2014-08-12 17:48:47 +00:00
parent 251a4cd25e
commit 4944b1a1fb

View File

@ -1381,7 +1381,7 @@ abstract class bo_merge
$LF = "\n"; $LF = "\n";
} }
if($is_xml) { if($is_xml) {
$this->replacements = str_replace(array('&','<','>',"\r","\n"),array('&amp;','&lt;','&gt;','',$LF),$this->replacements); $this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
} }
if (strpos($param[0],'$$NELF') === 0) if (strpos($param[0],'$$NELF') === 0)
{ //sets a Pagebreak and value, only if the field has a value { //sets a Pagebreak and value, only if the field has a value