aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/functions_metadata.inc.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/functions_metadata.inc.php b/include/functions_metadata.inc.php
index 148f8f775..ab3d6a7f1 100644
--- a/include/functions_metadata.inc.php
+++ b/include/functions_metadata.inc.php
@@ -150,9 +150,16 @@ function get_exif_data($filename, $map)
}
// Read EXIF data
- if ($exif = @read_exif_data($filename))
+ if ($exif = @read_exif_data($filename) or $exif2 = trigger_change('format_exif_data', $exif=null, $filename, $map))
{
- $exif = trigger_change('format_exif_data', $exif, $filename, $map);
+ if (!empty($exif2))
+ {
+ $exif = $exif2;
+ }
+ else
+ {
+ $exif = trigger_change('format_exif_data', $exif, $filename, $map);
+ }
// configured fields
foreach ($map as $key => $field)