From: Gergő Tisza <tgr.huwiki@gmail.com>
Date: Wed, 14 Jan 2015 03:04:02 +0000 (+0000)
Subject: Ignore EXIF data in FormatMetadata::fetchExtendedMetadata()
X-Git-Tag: 1.31.0-rc.0~12453^2
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=25e226b65292fd09c6c36e35174ea2dfef636958;p=lhc%2Fweb%2Fwiklou.git

Ignore EXIF data in FormatMetadata::fetchExtendedMetadata()

fetchExtendedMetadata() gets extra data such as file templates
via the GetExtendedMetadata hook; keys which are absent in the
extended data default to their EXIF value.

This turned out to be a bad idea as EXIF data is too messy in
practice with various devices putting e.g. manufacturer name for
author name; completely ignoring EXIF data in the extmetadata API
is still the better option.

Bug: T73719
Change-Id: I77b1df67d08097504b3b1026c584063488e03b6e
---

diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index e8e73af18f..7246072ded 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1679,17 +1679,6 @@ class FormatMetadata extends ContextSource {
 			);
 		}
 
-		$common = $file->getCommonMetaArray();
-
-		if ( $common !== false ) {
-			foreach ( $common as $key => $value ) {
-				$fileMetadata[$key] = array(
-					'value' => $value,
-					'source' => 'file-metadata',
-				);
-			}
-		}
-
 		return $fileMetadata;
 	}