r55745 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r55744‎ | r55745 | r55746 >
Date:06:34, 2 September 2009
Author:tstarling
Status:ok
Tags:
Comment:
Revert r52158 per CR: was attempting to convert text to UTF-8 that was already UTF-8, this would have resulted in mojibake.
Modified paths:
  • /trunk/phase3/includes/DjVuImage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/DjVuImage.php
@@ -250,7 +250,6 @@
251251 $txt = wfShellExec( $cmd, $retval );
252252 wfProfileOut( 'djvutxt' );
253253 if( $retval == 0) {
254 - $txt = utf8_encode($txt);
255254 $txt = htmlspecialchars($txt);
256255 $txt = preg_replace( "/\((page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*\&quot;([^<]*?)\&quot;\s*|)\)/s", "<PAGE value=\"$2\" />", $txt );
257256 $txt = "<DjVuTxt>\n<HEAD></HEAD>\n<BODY>\n" . $txt . "</BODY>\n</DjVuTxt>\n";

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r52158encode string to utf8 before converting to xmlthomasv09:51, 19 June 2009

Status & tagging log