aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_metadata.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-06-07 19:06:20 +0000
committerrvelices <rv-github@modusoptimus.com>2010-06-07 19:06:20 +0000
commit497203da33a14f99033dee0e5a53931edd3883f7 (patch)
tree6322590e13068e7bd7e8a5385c75ce806d5fa2ee /include/functions_metadata.inc.php
parent40cab61e1ffd1fc3c3f4974e662303b4a066625f (diff)
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
Diffstat (limited to '')
-rw-r--r--include/functions_metadata.inc.php44
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;