Merge "Replace some MWException usage in User"

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

diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index 016728d..dbbe991 100644 (file)
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -123,9 +123,9 @@ class DjVuImage {
        }
 
        function getInfo() {
-               wfSuppressWarnings();
+               MediaWiki\suppressWarnings();
                $file = fopen( $this->mFilename, 'rb' );
-               wfRestoreWarnings();
+               MediaWiki\restoreWarnings();
                if ( $file === false ) {
                        wfDebug( __METHOD__ . ": missing or failed file read\n" );
 
@@ -319,7 +319,7 @@ EOR;
 
        function pageTextCallback( $matches ) {
                # Get rid of invalid UTF-8, strip control characters
-               $val = htmlspecialchars( UtfNormal::cleanUp( stripcslashes( $matches[1] ) ) );
+               $val = htmlspecialchars( UtfNormal\Validator::cleanUp( stripcslashes( $matches[1] ) ) );
                $val = str_replace( array( "\n", '�' ), array( '
', '' ), $val );
                return '<PAGE value="' . $val . '" />';
        }