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

feature 620: ability to synchronize metadata from high definition photo, if no

Browse Source 
metadata available in "web sized" photo. This commit is a report of r4683 from
update_metadata function in admin/include/functions_metadata.php in the
duplicated code get_element_metadata of admin/site_reader_local.php. See
feature 620 for details about code duplication.

git-svn-id: http://piwigo.org/svn/trunk@6076 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-05-04 23:45:20 +00:00
parent a00a203998
commit addb6b5ddc
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
admin/site_reader_local.php
View File

@@ -205,12 +205,22 @@ function get_element_metadata($file, $has_high = false)
if ($conf['use_exif'])
{
$data = array_merge($data, 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);
}
if ($conf['use_iptc'])
{
$data = array_merge($data, 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);
}
return $data;