X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FFormatMetadata.php;h=2c541e0ff4362bec8c4739c17e13a25db881edaa;hb=cf539bb31686590ffaa4b06480dbb15b1f272427;hp=51a0135859efd6ff3613fe7b7f78ef7a65813037;hpb=63ab00b60ddc167b6359c7d51ed9e9c4f65b7258;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index 51a0135859..2c541e0ff4 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -24,6 +24,7 @@
  * @see http://exif.org/Exif2-2.PDF The Exif 2.2 specification
  * @file
  */
+use Wikimedia\Timestamp\TimestampException;
 
 /**
  * Format Image metadata values into a human readable form.
@@ -100,6 +101,9 @@ class FormatMetadata extends ContextSource {
 	public function makeFormattedData( $tags ) {
 		$resolutionunit = !isset( $tags['ResolutionUnit'] ) || $tags['ResolutionUnit'] == 2 ? 2 : 3;
 		unset( $tags['ResolutionUnit'] );
+		// Width and height are for internal use and already available & displayed outside of metadata
+		unset( $tags['Width'] );
+		unset( $tags['Height'] );
 
 		foreach ( $tags as $tag => &$vals ) {
 			// This seems ugly to wrap non-array's in an array just to unwrap again,