aboutsummaryrefslogtreecommitdiffstats
path: root/admin/site_reader_local.php
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2011-04-08 09:09:13 +0000
committermistic100 <mistic@piwigo.org>2011-04-08 09:09:13 +0000
commit797ddead2ae5f678eee182993023f524f8536d9f (patch)
tree1a21201fd6898948b066d96930ea72a8ecac72a3 /admin/site_reader_local.php
parent6e3a69f232d1910f0f780f37c476b25964990f76 (diff)
bug:1791 display hd dimensions instead of websize dimensions
git-svn-id: http://piwigo.org/svn/trunk@10157 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/site_reader_local.php')
-rw-r--r--admin/site_reader_local.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/admin/site_reader_local.php b/admin/site_reader_local.php
index 5addc3a95..da12e9398 100644
--- a/admin/site_reader_local.php
+++ b/admin/site_reader_local.php
@@ -154,7 +154,7 @@ function get_metadata_attributes()
{
global $conf;
- $update_fields = array('filesize', 'width', 'height', 'high_filesize');
+ $update_fields = array('filesize', 'width', 'height', 'high_filesize', 'high_width', 'high_height');
if ($conf['use_exif'])
{
@@ -199,8 +199,13 @@ function get_element_metadata($file, $has_high = false)
if ($has_high)
{
$high_file = dirname($file).'/pwg_high/'.basename($file);
-
$data['high_filesize'] = floor(filesize($high_file)/1024);
+
+ if ($high_size = @getimagesize($high_file))
+ {
+ $data['high_width'] = $high_size[0];
+ $data['high_height'] = $high_size[1];
+ }
}
if ($conf['use_exif'])