From: Tim Starling Date: Wed, 2 Sep 2009 06:34:07 +0000 (+0000) Subject: Revert r52158 per CR: was attempting to convert text to UTF-8 that was already UTF... X-Git-Tag: 1.31.0-rc.0~39971 X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=f6dbe824d9e365d4b2e60b7366d316558739c188;p=lhc%2Fweb%2Fwiklou.git Revert r52158 per CR: was attempting to convert text to UTF-8 that was already UTF-8, this would have resulted in mojibake. --- diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php index 1b8c4e4c10..406878d076 100644 --- a/includes/DjVuImage.php +++ b/includes/DjVuImage.php @@ -250,7 +250,6 @@ class DjVuImage { $txt = wfShellExec( $cmd, $retval ); wfProfileOut( 'djvutxt' ); if( $retval == 0) { - $txt = utf8_encode($txt); $txt = htmlspecialchars($txt); $txt = preg_replace( "/$(page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*\"([^<]*?)\"\s*|)$/s", "", $txt ); $txt = "\n\n\n" . $txt . "\n\n";