From cfb002835d4776f8ea1b642a90b123d93676bf8f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 30 Dec 2008 21:43:54 +0000 Subject: [PATCH] Accept 'utf8' flag in place of 'utf-8' to compensate for entries broken by bug 16841 in recompressTracked.php stuff --- includes/Revision.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/Revision.php b/includes/Revision.php index a6147ba0f9..7938d88a8d 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -720,9 +720,11 @@ class Revision { } global $wgLegacyEncoding; - if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) ) { + if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) ) { # Old revisions kept around in a legacy encoding? # Upconvert on demand. + # ("utf8" checked for compatibility with some broken + # conversion scripts 2008-12-30) global $wgInputEncoding, $wgContLang; $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text ); } -- 2.20.1