iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge r30887 from trunk to branch 2.7

Browse Source 
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/branches/2.7@30888 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2015-01-12 08:39:43 +00:00
parent a9c7ac432c
commit 48354d14aa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/functions_metadata.inc.php
View File

@@ -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)