1 files changed, 6 insertions, 3 deletions

diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php
index 4cc91f4ef..856722b32 100644
--- a/system/helpers/xml_helper.php
+++ b/system/helpers/xml_helper.php
@@ -36,15 +36,18 @@
  */	
 function xml_convert($str)
 {
-	$temp = '__TEMP_AMPERSANDS';
-	
+	$temp = '__TEMP_AMPERSANDS__';
+
+	// Replace entities to temporary markers so that 
+	// ampersands won't get messed up
 	$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
 	$str = preg_replace("/&(\w+);/",  "$temp\\1;", $str);
 	
 	$str = str_replace(array("&","<",">","\"", "'", "-"),
 					   array("&amp;", "&lt;", "&gt;", "&quot;", "&#39;", "&#45;"),
 					   $str);
-		
+
+	// Decode the temp markers back to entities		
 	$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
 	$str = preg_replace("/$temp(\w+);/","&\\1;", $str);