aboutsummaryrefslogtreecommitdiffstats
path: root/include/picture_metadata.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-12-27 05:26:44 +0000
committerrvelices <rv-github@modusoptimus.com>2011-12-27 05:26:44 +0000
commit753f58d6a966a1051dcd62a3eeab8fc18798bcac (patch)
tree2ebbfec86d511aa980e0d23c170bfa5006a8793e /include/picture_metadata.inc.php
parente77e68b7db17c28c1ca44f4865758f2afb871d07 (diff)
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 ... git-svn-id: http://piwigo.org/svn/trunk@12796 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/picture_metadata.inc.php22
1 files changed, 1 insertions, 21 deletions
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php
index 59683ff01..db0aff887 100644
--- a/include/picture_metadata.inc.php
+++ b/include/picture_metadata.inc.php
@@ -26,18 +26,6 @@
*
*/
-// $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')))
@@ -49,10 +37,6 @@ if (($conf['show_exif']) and (function_exists('read_exif_data')))
}
$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)
{
@@ -96,10 +80,6 @@ if (($conf['show_exif']) and (function_exists('read_exif_data')))
if ($conf['show_iptc'])
{
$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)
{
@@ -122,4 +102,4 @@ if ($conf['show_iptc'])
}
-?>
+?> \ No newline at end of file