mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-09 18:23:18 +02:00
- quick fix (maybe not the cleanest) of regression 2.0 -> 2.1 when displaying metadata on picture page (event called with different input)
git-svn-id: http://piwigo.org/svn/trunk@6473 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -29,18 +29,11 @@
|
||||
include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
|
||||
if (($conf['show_exif']) and (function_exists('read_exif_data')))
|
||||
{
|
||||
$exif_mapping = array();
|
||||
foreach ($conf['show_exif_fields'] as $field)
|
||||
{
|
||||
$exif_mapping[$field] = $field;
|
||||
}
|
||||
|
||||
$exif = get_exif_data($picture['current']['image_path'], $exif_mapping);
|
||||
$exif = get_exif_data($picture['current']['image_path'], null);
|
||||
if (count($exif) == 0 and $picture['current']['has_high'])
|
||||
{
|
||||
$exif = get_exif_data($picture['current']['high_url'], $exif_mapping);
|
||||
$exif = get_exif_data($picture['current']['high_url'], null);
|
||||
}
|
||||
|
||||
if (count($exif) > 0)
|
||||
{
|
||||
$exif = trigger_event('format_exif_data', $exif, $picture['current'] );
|
||||
|
||||
Reference in New Issue
Block a user