dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 53b9287)
Revert r52158 per CR: was attempting to convert text to UTF-8 that was already UTF...
authorTim Starling <tstarling@users.mediawiki.org>
Wed, 2 Sep 2009 06:34:07 +0000 (06:34 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Wed, 2 Sep 2009 06:34:07 +0000 (06:34 +0000)
includes/DjVuImage.php patch | blob | history

diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index 1b8c4e4..406878d 100644 (file)
--- 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*\&quot;([^<]*?)\&quot;\s*|)\)/s", "<PAGE value=\"$2\" />", $txt  );
                                $txt = "<DjVuTxt>\n<HEAD></HEAD>\n<BODY>\n" . $txt . "</BODY>\n</DjVuTxt>\n";
Wiklou, le Wiki du Wiklou