Merge "Avoid use of rollback() in WikiPage::doEditContent()"

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

diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php
index 968e424..c2870c2 100644 (file)
--- a/includes/media/ImageHandler.php
+++ b/includes/media/ImageHandler.php
@@ -61,7 +61,7 @@ abstract class ImageHandler extends MediaHandler {
                }
 
                # Removed for ProofreadPage
-               #$width = intval( $width );
+               # $width = intval( $width );
                return "{$width}px";
        }
 
@@ -201,9 +201,9 @@ abstract class ImageHandler extends MediaHandler {
        }
 
        function getImageSize( $image, $path ) {
-               wfSuppressWarnings();
+               MediaWiki\suppressWarnings();
                $gis = getimagesize( $path );
-               wfRestoreWarnings();
+               MediaWiki\restoreWarnings();
 
                return $gis;
        }