From e7b5cb1dbc13dfe85ceb221f42531875e457ad93 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 3 Nov 2010 16:22:01 +0000
Subject: [PATCH] do not use ENT_IGNORE on the first attempt (effective for php
 > 5.3 only anyway)

---
 felamimail/inc/class.uiwidgets.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/felamimail/inc/class.uiwidgets.inc.php b/felamimail/inc/class.uiwidgets.inc.php
index 8df6633949..a934d0ea77 100644
--- a/felamimail/inc/class.uiwidgets.inc.php
+++ b/felamimail/inc/class.uiwidgets.inc.php
@@ -321,7 +321,7 @@
 				$replace = '';
 
 				$header['subject'] = preg_replace($search,$replace,$header['subject']);
-				$headerSubject = @htmlentities($header['subject'],ENT_QUOTES | ENT_IGNORE,$this->charset,false);
+				$headerSubject = @htmlentities($header['subject'],ENT_QUOTES,$this->charset,false);
 				if (empty($headerSubject)) $headerSubject = @htmlentities($GLOBALS['egw']->translation->convert($header['subject'], bofelamimail::detect_encoding($header['subject']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
 				$header['subject'] = $headerSubject;
 				// curly brackets get messed up by the template!
@@ -379,11 +379,11 @@
 
 				if ($_folderType > 0) {
 					// sent or drafts or template folder
-					$header2add = @htmlentities($header['to_address'],ENT_QUOTES | ENT_IGNORE,$this->charset,false);
+					$header2add = @htmlentities($header['to_address'],ENT_QUOTES,$this->charset,false);
 					if (empty($header2add)) $header2add = @htmlentities($GLOBALS['egw']->translation->convert($header['to_address'], bofelamimail::detect_encoding($header['to_address']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
 					$header['to_address'] = $header2add;
 					if (!empty($header['to_name'])) {
-						$header2name = @htmlentities($header['to_name'],ENT_QUOTES | ENT_IGNORE,$this->charset,false);
+						$header2name = @htmlentities($header['to_name'],ENT_QUOTES,$this->charset,false);
 						if (empty($header2name)) $header2name = @htmlentities($GLOBALS['egw']->translation->convert($header['to_name'], bofelamimail::detect_encoding($header['to_name']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
 						$header['to_name'] = $header2name;
 
@@ -394,11 +394,11 @@
 						$full_address	= $header['to_address'];
 					}
 				} else {
-					$header2add = @htmlentities($header['sender_address'],ENT_QUOTES | ENT_IGNORE,$this->charset,false);
+					$header2add = @htmlentities($header['sender_address'],ENT_QUOTES,$this->charset,false);
 					if (empty($header2add)) $header2add = @htmlentities($GLOBALS['egw']->translation->convert($header['sender_address'], bofelamimail::detect_encoding($header['sender_address']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
 					$header['sender_address'] = $header2add;
 					if (!empty($header['sender_name'])) {
-						$header2name = @htmlentities($header['sender_name'],ENT_QUOTES | ENT_IGNORE,$this->charset,false);
+						$header2name = @htmlentities($header['sender_name'],ENT_QUOTES,$this->charset,false);
 						if (empty($header2name)) $header2name = @htmlentities($GLOBALS['egw']->translation->convert($header['sender_name'], bofelamimail::detect_encoding($header['sender_name']), $this->charset),ENT_QUOTES | ENT_IGNORE,$this->charset,false);
 						$header['sender_name'] = $header2name;