mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
Fix double encoded & in merge functions
This commit is contained in:
parent
251a4cd25e
commit
4944b1a1fb
@ -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('&','<','>','',$LF),$this->replacements);
|
$this->replacements = str_replace(array('&','&amp;','<','>',"\r","\n"),array('&','&','<','>','',$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
|
||||||
|
Loading…
Reference in New Issue
Block a user