From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 30 Dec 2008 21:43:54 +0000 (+0000)
Subject: Accept 'utf8' flag in place of 'utf-8' to compensate for entries broken by bug 16841... 
X-Git-Tag: 1.31.0-rc.0~43686
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=cfb002835d4776f8ea1b642a90b123d93676bf8f;p=lhc%2Fweb%2Fwiklou.git

Accept 'utf8' flag in place of 'utf-8' to compensate for entries broken by bug 16841 in recompressTracked.php stuff
---

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 );
 			}