From b89c654d3706055fde1dff12980d95d9a9f9e970 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 18 Aug 2014 20:33:40 +0000
Subject: [PATCH] Fix double encoded & in merge functions

---
 etemplate/inc/class.bo_merge.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index ee84a7ce0a..16419e7bc2 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -1381,7 +1381,7 @@ abstract class bo_merge
 					$LF = "\n";
 			}
 		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)
 		{	//sets a Pagebreak and value, only if the field has a value