Changeset 30888

Timestamp:

Jan 12, 2015, 9:39:43 AM (9 years ago)

Author:

plg

Message:

merge r30887 from trunk to branch 2.7

feature 2943: ability to display metadata (via plugin) even if Piwigo core
finds no EXIF. Patch by xbgmsharp (will be used by plugin videoJS).

File:

• branches/2.7/include/functions_metadata.inc.php (modified) (1 diff)

branches/2.7/include/functions_metadata.inc.php

@@ -151 +151 @@
 
   // Read EXIF data
-  if ($exif = @read_exif_data($filename))
-  {
-    $exif = trigger_change('format_exif_data', $exif, $filename, $map);
+  if ($exif = @read_exif_data($filename) or $exif2 = trigger_change('format_exif_data', $exif=null, $filename, $map))
+  {
+    if (!empty($exif2))
+    {
+      $exif = $exif2;
+    }
+    else
+    {
+      $exif = trigger_change('format_exif_data', $exif, $filename, $map);
+    }
 
     // configured fields