From 6c7e9b006207c2d69b998dfab9d7d9f373982621 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 16 Mar 2010 13:38:20 +0000
Subject: [PATCH] fixed regular expression to NOT "eat" 8 and , from merge
 print replacements

---
 etemplate/inc/class.bo_merge.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 335d8356bb..5d712df993 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -512,9 +512,9 @@ abstract class bo_merge
 					$value = str_replace(array("\r","\n",'<p>','</p>','<br />'),array('','','',"\r\n","\r\n"),$value);
 					$value = strip_tags($value);
 				}
-				// replace all control chars (C0+C1) but CR, LF and TAB (eg. vertical tabulators) with space
+				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
-				$value = preg_replace('/[\000-\008,\010,\011,\013,\014,\016-\037,\177-\237]/u',' ',$value);
+				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
 			}
 			// replace CRLF with linebreak tag of given type
 			switch($mimetype.$mso_application_progid)