Changeset 8631

Timestamp:

Jan 12, 2011, 3:59:11 PM (13 years ago)

Author:

plg

Message:

merge r8630 from branch 2.1 to trunk

bug 2104 fixed: ability to display EXIF/IPTC metadata from HD even if the HD
is not visible for user

File:

• trunk/include/picture_metadata.inc.php (modified) (3 diffs)

trunk/include/picture_metadata.inc.php

@@ -27 +27 @@
  */
 
+// $picture['current']['high_url'] may not be set if the user has no access
+// to the high definition, but we may want to display metadata and read the
+// high definition is available
+$high_url = null;
+if (isset($picture['current']['high_url']))
+{
+  $high_url = $picture['current']['high_url'];
+}
+else
+{
+  $high_url = get_high_url($picture['current']);
+}
+
 include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
 if (($conf['show_exif']) and (function_exists('read_exif_data')))
@@ -39 +52 @@
   if (count($exif) == 0 and $picture['current']['has_high'])
   {
-    $exif = get_exif_data($picture['current']['high_url'], $exif_mapping);
+    $exif = get_exif_data($high_url, $exif_mapping);
   }
   
@@ -86 +99 @@
   if (count($iptc) == 0 and $picture['current']['has_high'])
   {
-    $iptc = get_iptc_data($picture['current']['high_url'], $conf['show_iptc_mapping']);
+    $iptc = get_iptc_data($high_url, $conf['show_iptc_mapping']);
   }