Index: branches/2.1/include/picture_metadata.inc.php
===================================================================
--- branches/2.1/include/picture_metadata.inc.php	(revision 6364)
+++ branches/2.1/include/picture_metadata.inc.php	(revision 6474)
@@ -30,16 +30,9 @@
 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)
   {