diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-06-06 10:14:26 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-06-06 10:14:26 +0000 |
| commit | 4664661c50f46abcefc2dec795b12677e479b229 (patch) | |
| tree | 14b8ca4064644a10e28a2a35f9bc0d5c58ce0fb1 /include/picture_metadata.inc.php | |
| parent | e49ff390d34685200cb2148aeded472c56bf1b68 (diff) | |
merge r6473 from trunk to branch 2.1
- 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/branches/2.1@6474 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/picture_metadata.inc.php')
| -rw-r--r-- | include/picture_metadata.inc.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php index df37b4212..7b4ce9dc1 100644 --- a/include/picture_metadata.inc.php +++ b/include/picture_metadata.inc.php @@ -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'] ); |