feature 2943: ability to display metadata (via plugin) even if Piwigo core

finds no EXIF. Patch by xbgmsharp (will be used by plugin videoJS).


git-svn-id: http://piwigo.org/svn/trunk@30887 68402e56-0260-453c-a942-63ccdbb3a9ee

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)