* Changed @ => wfSuppressWarnings

* Added wfSuppressWarnings to Bitmap.php:
Notice: unserialize(): Error at offset 0 of 2 bytes in D:\www\MW_trunk\phase3\includes\media\Bitmap.php on line 685

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 9bb1470..be4fb2d 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -682,7 +682,9 @@ class BitmapHandler extends ImageHandler {
                if ( !$data ) {
                        return 0;
                }
+               wfSuppressWarnings();
                $data = unserialize( $data );
+               wfRestoreWarnings();
                if ( isset( $data['Orientation'] ) ) {
                        # See http://sylvana.net/jpegcrop/exif_orientation.html
                        switch ( $data['Orientation'] ) {

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index de0307d..04cea75 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -216,7 +216,9 @@ class SvgHandler extends ImageHandler {
        }
 
        function unpackMetadata( $metadata ) {
+               wfSuppressWarnings();
                $unser = @unserialize( $metadata );
+               wfRestoreWarnings();
                if ( isset( $unser['version'] ) && $unser['version'] == self::SVG_METADATA_VERSION ) {
                        return $unser;
                } else {