| Index: trunk/phase3/includes/DjVuImage.php |
| — | — | @@ -251,9 +251,7 @@ |
| 252 | 252 | wfProfileOut( 'djvutxt' ); |
| 253 | 253 | if( $retval == 0) { |
| 254 | 254 | # Get rid of invalid UTF-8, strip control characters |
| 255 | | - wfSuppressWarnings(); |
| 256 | | - $txt = iconv( "UTF-8","UTF-8//IGNORE", $txt ); |
| 257 | | - wfRestoreWarnings(); |
| | 255 | + $txt = UtfNormal::cleanUp( $txt ); |
| 258 | 256 | $txt = preg_replace( "/[\013\035\037]/", "", $txt ); |
| 259 | 257 | $txt = htmlspecialchars($txt); |
| 260 | 258 | $txt = preg_replace( "/\((page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*\"([^<]*?)\"\s*|)\)/s", "<PAGE value=\"$2\" />", $txt ); |