merge r6484 from trunk to branch 2.1

- revert r6473 and r6475
- moved call to event format_exif_data earlier

git-svn-id: http://piwigo.org/svn/branches/2.1@6485 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 19 insertions, 25 deletions

diff --git a/include/functions_metadata.inc.php b/include/functions_metadata.inc.php
index 2b298606f..95ed2befc 100644
--- a/include/functions_metadata.inc.php
+++ b/include/functions_metadata.inc.php
@@ -117,31 +117,25 @@ function get_exif_data($filename, $map)
   // Read EXIF data
   if ($exif = @read_exif_data($filename))
   {
-		if ($map != null)
-		{
-			foreach ($map as $key => $field)
-			{
-				if (strpos($field, ';') === false)
-				{
-					if (isset($exif[$field]))
-					{
-						$result[$key] = $exif[$field];
-					}
-				}
-				else
-				{
-					$tokens = explode(';', $field);
-					if (isset($exif[$tokens[0]][$tokens[1]]))
-					{
-						$result[$key] = $exif[$tokens[0]][$tokens[1]];
-					}
-				}
-			}
-		}
-		else
-		{
-			$result = $exif;
-		}
+    $exif = trigger_event('format_exif_data', $exif, $filename );
+    foreach ($map as $key => $field)
+    {
+      if (strpos($field, ';') === false)
+      {
+        if (isset($exif[$field]))
+        {
+          $result[$key] = $exif[$field];
+        }
+      }
+      else
+      {
+        $tokens = explode(';', $field);
+        if (isset($exif[$tokens[0]][$tokens[1]]))
+        {
+          $result[$key] = $exif[$tokens[0]][$tokens[1]];
+        }
+      }
+    }
   }
 
   return $result;