From 7984af4c0e58e676ff4b0b3d16699c6d62f458db Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 6 Sep 2011 06:25:17 +0000
Subject: [PATCH] specify encoding, as it defaults to latin1 (iso-8859-1) which
 is not longer used by EGroupware and writes non-ascii as entities

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

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 038f0813b5..d10c7ea51b 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -734,8 +734,9 @@ abstract class bo_merge
 				if (is_string($value) && (strpos($value,'<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
-						$value = tidy_repair_string($value, self::$tidy_config);
+					if($replace_tags && extension_loaded('tidy'))
+					{
+						$value = tidy_repair_string($value, self::$tidy_config, 'utf8');
 					}
 					// replace </p> and <br /> with CRLF (remove <p> and CRLF)
 					$value = str_replace(array("\r","\n",'<p>','</p>','<br />'),array('','','',"\r\n","\r\n"),$value);