Don't use @, use wfSuppress/RestoreWarnings

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index d34f125..5a64b32 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -372,7 +372,9 @@ class BitmapHandler extends ImageHandler {
                        # Special value indicating that there is no EXIF data in the file
                        return true;
                }
-               $exif = @unserialize( $metadata );
+               wfSuppressWarnings();
+               $exif = unserialize( $metadata );
+               wfRestoreWarnings();
                if ( !isset( $exif['MEDIAWIKI_EXIF_VERSION'] ) ||
                        $exif['MEDIAWIKI_EXIF_VERSION'] != Exif::version() )
                {

diff --git a/includes/media/GIF.php b/includes/media/GIF.php
index 434762f..636ae64 100644 (file)
--- a/includes/media/GIF.php
+++ b/includes/media/GIF.php
@@ -54,15 +54,19 @@ class GIFHandler extends BitmapHandler {
        }
        
        function isMetadataValid( $image, $metadata ) {
-               $data = @unserialize( $metadata );
+               wfSuppressWarnings();
+               $data = unserialize( $metadata );
+               wfRestoreWarnings();
                return (boolean) $data;
        }
 
        function getLongDesc( $image ) {
                global $wgUser, $wgLang;
                $sk = $wgUser->getSkin();
-               
-               $metadata = @unserialize($image->getMetadata());
+
+               wfSuppressWarnings();
+               $metadata = unserialize($image->getMetadata());
+               wfRestoreWarnings();
                
                if (!$metadata) return parent::getLongDesc( $image );