Changeset 6474 for branches

Timestamp:

Jun 6, 2010, 12:14:26 PM (14 years ago)

Author:

rvelices

Message:

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)

Location:

branches/2.1/include

Files:

• functions_metadata.inc.php (modified) (1 diff)
• picture_metadata.inc.php (modified) (1 diff)

branches/2.1/include/functions_metadata.inc.php

@@ -118 +118 @@
   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;
+                }
   }
 

branches/2.1/include/picture_metadata.inc.php

@@ -30 +30 @@
 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)
   {