adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-05 09:22:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r4682 from branch 2.0 to trunk

Browse Source 
feature 620: if no exif/iptc found in the "web resized" photo, then we search
into the high definition picture if available. Thanks to Jochen Roth (Polly)
for the patch.


git-svn-id: http://piwigo.org/svn/trunk@4683 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-01-15 10:47:42 +00:00
parent 080a84810e
commit 568cb2e3b1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions_metadata.php
+8
View File
@@ -141,12 +141,20 @@ SELECT id
if ($conf['use_exif']) if ($conf['use_exif'])
{ {
$exif = get_sync_exif_data($file); $exif = get_sync_exif_data($file);
if (count($exif) == 0 and isset($data['high_filesize']))
{
$exif = get_sync_exif_data($high_file);
}
$data = array_merge($data, $exif); $data = array_merge($data, $exif);
} }
if ($conf['use_iptc']) if ($conf['use_iptc'])
{ {
$iptc = get_sync_iptc_data($file); $iptc = get_sync_iptc_data($file);
if (count($iptc) == 0 and isset($data['high_filesize']))
{
$iptc = get_sync_iptc_data($high_file);
}
$data = array_merge($data, $iptc); $data = array_merge($data, $iptc);
if (count($iptc) > 0) if (count($iptc) > 0)