Changeset 12796 for trunk/include/picture_metadata.inc.php

Timestamp:

Dec 27, 2011, 6:26:44 AM (13 years ago)

Author:

rvelices

Message:

feature 2541 multisize

• core implementation + usage on most public/admin pages
• still to do: sync process, upload, gui/persistence for size parameters, migration script, center of interest ...

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');
@@ -50 +38 @@
 
   $exif = get_exif_data($picture['current']['image_path'], $exif_mapping);
-  if (count($exif) == 0 and $picture['current']['has_high'])
-  {
-    $exif = get_exif_data($high_url, $exif_mapping);
-  }
   
   if (count($exif) > 0)
@@ -97 +81 @@
 {
   $iptc = get_iptc_data($picture['current']['image_path'], $conf['show_iptc_mapping']);
-  if (count($iptc) == 0 and $picture['current']['has_high'])
-  {
-    $iptc = get_iptc_data($high_url, $conf['show_iptc_mapping']);
-  }
 
   if (count($iptc) > 0)