From c9577f620e99119b41b6b2406aa862183e5ebd14 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 27 Feb 2006 22:26:34 +0000
Subject: [PATCH] =?UTF-8?q?bug=20sur=20#CHARSET=20mal=20r=C3=A9solu=20(Ben?=
=?UTF-8?q?.spip)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_charsets.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ecrire/inc_charsets.php b/ecrire/inc_charsets.php
index e727c2dc8e..44272fc233 100644
--- a/ecrire/inc_charsets.php
+++ b/ecrire/inc_charsets.php
@@ -573,8 +573,9 @@ function transcoder_page($texte, $headers='') {
else if (preg_match(
',<(meta|html|body)[^>]*charset[^>]*=[^>]*([-_a-z0-9]+?),Uims',
$texte, $regs)
- AND !preg_match(',^charset$,i', $charset)) # eviter #CHARSET des squelettes
- $charset = trim(strtolower($regs[2]));
+ # eviter #CHARSET des squelettes
+ AND (($tmp = trim(strtolower($regs[2]))) != 'charset'))
+ $charset = $tmp;
// charset de la reponse http
else if (preg_match(',charset=([-_a-z0-9]+),i', $headers, $regs))
$charset = trim(strtolower($regs[1]));
--
GitLab