http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88768
Revision: 88768
Author: aaron
Date: 2011-05-25 00:25:29 +0000 (Wed, 25 May 2011)
Log Message:
-----------
* 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
Modified Paths:
--------------
trunk/phase3/includes/media/Bitmap.php
trunk/phase3/includes/media/SVG.php
Modified: trunk/phase3/includes/media/Bitmap.php
===================================================================
--- trunk/phase3/includes/media/Bitmap.php 2011-05-25 00:10:31 UTC (rev
88767)
+++ trunk/phase3/includes/media/Bitmap.php 2011-05-25 00:25:29 UTC (rev
88768)
@@ -682,7 +682,9 @@
if ( !$data ) {
return 0;
}
+ wfSuppressWarnings();
$data = unserialize( $data );
+ wfRestoreWarnings();
if ( isset( $data['Orientation'] ) ) {
# See http://sylvana.net/jpegcrop/exif_orientation.html
switch ( $data['Orientation'] ) {
Modified: trunk/phase3/includes/media/SVG.php
===================================================================
--- trunk/phase3/includes/media/SVG.php 2011-05-25 00:10:31 UTC (rev 88767)
+++ trunk/phase3/includes/media/SVG.php 2011-05-25 00:25:29 UTC (rev 88768)
@@ -216,7 +216,9 @@
}
function unpackMetadata( $metadata ) {
+ wfSuppressWarnings();
$unser = @unserialize( $metadata );
+ wfRestoreWarnings();
if ( isset( $unser['version'] ) && $unser['version'] ==
self::SVG_METADATA_VERSION ) {
return $unser;
} else {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
