From 9297dbbec65903d63fddf5878442c7886e45694c Mon Sep 17 00:00:00 2001 From: Thorsten Schöning Date: Tue, 27 Nov 2012 22:50:15 +0800 Subject: Bug 804093: Fix autodetected charset for windows-1252 encoded content r=glob,a=LpSolit --- Bugzilla/Util.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index 002f30ece..9bdff77f3 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -763,12 +763,12 @@ sub detect_encoding { } # Encode::Detect sometimes mis-detects various ISO encodings as iso-8859-8, - # but Encode::Guess can usually tell which one it is. - if ($encoding && $encoding eq 'iso-8859-8') { + # or cp1255, but Encode::Guess can usually tell which one it is. + if ($encoding && ($encoding eq 'iso-8859-8' || $encoding eq 'cp1255')) { my $decoded_as = _guess_iso($data, 'iso-8859-8', # These are ordered this way because it gives the most # accurate results. - qw(iso-8859-7 iso-8859-2)); + qw(cp1252 iso-8859-7 iso-8859-2)); $encoding = $decoded_as if $decoded_as; } -- cgit v1.2.3-24-g4f1b