aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_metadata.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-06-06 10:14:26 +0000
committerrvelices <rv-github@modusoptimus.com>2010-06-06 10:14:26 +0000
commit4664661c50f46abcefc2dec795b12677e479b229 (patch)
tree14b8ca4064644a10e28a2a35f9bc0d5c58ce0fb1 /include/functions_metadata.inc.php
parente49ff390d34685200cb2148aeded472c56bf1b68 (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/functions_metadata.inc.php')
-rw-r--r--include/functions_metadata.inc.php43
1 files changed, 25 insertions, 18 deletions
diff --git a/include/functions_metadata.inc.php b/include/functions_metadata.inc.php
index 5f2041291..2b298606f 100644
--- a/include/functions_metadata.inc.php
+++ b/include/functions_metadata.inc.php
@@ -117,24 +117,31 @@ function get_exif_data($filename, $map)
// Read EXIF data
if ($exif = @read_exif_data($filename))
{
- foreach ($map as $key => $field)
- {
- if (strpos($field, ';') === false)
- {
- if (isset($exif[$field]))
- {
- $result[$key] = $exif[$field];
- }
- }
- else
- {
- $tokens = explode(';', $field);
- if (isset($exif[$tokens[0]][$tokens[1]]))
- {
- $result[$key] = $exif[$tokens[0]][$tokens[1]];
- }
- }
- }
+ if ($map != null)
+ {
+ foreach ($map as $key => $field)
+ {
+ if (strpos($field, ';') === false)
+ {
+ if (isset($exif[$field]))
+ {
+ $result[$key] = $exif[$field];
+ }
+ }
+ else
+ {
+ $tokens = explode(';', $field);
+ if (isset($exif[$tokens[0]][$tokens[1]]))
+ {
+ $result[$key] = $exif[$tokens[0]][$tokens[1]];
+ }
+ }
+ }
+ }
+ else
+ {
+ $result = $exif;
+ }
}
return $result;