| Index: trunk/phase3/includes/Revision.php |
| — | — | @@ -720,9 +720,11 @@ |
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | global $wgLegacyEncoding; |
| 724 | | - if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) ) { |
| | 724 | + if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) ) { |
| 725 | 725 | # Old revisions kept around in a legacy encoding? |
| 726 | 726 | # Upconvert on demand. |
| | 727 | + # ("utf8" checked for compatibility with some broken |
| | 728 | + # conversion scripts 2008-12-30) |
| 727 | 729 | global $wgInputEncoding, $wgContLang; |
| 728 | 730 | $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text ); |
| 729 | 731 | } |