From 4b90912fcc806551bb4d2923538eb0feb3e60a75 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 3 Mar 2003 21:39:24 +0000
Subject: [PATCH] =?UTF-8?q?ne=20rien=20faire=20si=20le=20charset=20n'est?=
 =?UTF-8?q?=20pas=20support=C3=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/inc_filtres.php3 | 2 +-
 ecrire/inc_mail.php3    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ecrire/inc_filtres.php3 b/ecrire/inc_filtres.php3
index 278d62c2ae..f4db3a6a34 100644
--- a/ecrire/inc_filtres.php3
+++ b/ecrire/inc_filtres.php3
@@ -135,7 +135,7 @@ function filtrer_entites($texte) {	// html -> texte, a completer
 
 	if (lire_meta('charset') == 'iso-8859-1')	// recuperer les caracteres iso-latin
 		$texte = strtr2 ($texte, $trans_iso);
-	else {
+	else if (lire_meta('charset') == 'utf-8') {
 		// 1. recuperer les caracteres binaires en &#1234;
 		$texte = entites_unicode($texte);
 		// 2. les &eacute; en iso-8859-1
diff --git a/ecrire/inc_mail.php3 b/ecrire/inc_mail.php3
index e1554cba39..4c22ef5de5 100644
--- a/ecrire/inc_mail.php3
+++ b/ecrire/inc_mail.php3
@@ -56,10 +56,8 @@ function envoyer_mail($email, $sujet, $texte, $from = "", $headers = "") {
 	$sujet = filtrer_entites($sujet);
 
 	// encoder le sujet si possible selon la RFC
-	if($GLOBALS['flag_multibyte']) {
-		mb_internal_encoding($charset);
+	if($GLOBALS['flag_multibyte'] AND mb_internal_encoding($charset))
 		$sujet = mb_encode_mimeheader($sujet, $charset, 'Q');
-	}
 
 	if ($flag_wordwrap) $texte = wordwrap($texte);
 
-- 
GitLab