Fixup some more wrong static usages

[lhc/web/wiklou.git] / includes / DjVuImage.php

diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index f14d8d6..842b3a9 100644 (file)
--- a/includes/DjVuImage.php
+++ b/includes/DjVuImage.php
@@ -251,13 +251,7 @@ class DjVuImage {
                        wfProfileOut( 'djvutxt' );
                        if( $retval == 0) {
                                # Get rid of invalid UTF-8, strip control characters
-                               if( is_callable( 'iconv' ) ) {
-                                       wfSuppressWarnings();
-                                       $txt = iconv( "UTF-8","UTF-8//IGNORE", $txt );
-                                       wfRestoreWarnings();
-                               } else {
-                                       $txt = UtfNormal::cleanUp( $txt );
-                               }
+                               $txt = UtfNormal::cleanUp( $txt );
                                $txt = preg_replace( "/[\013\035\037]/", "", $txt );
                                $reg = <<<EOR
                                        /\(page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*"