Permalink
Browse files

merge r16281 from branch 2.4 to trunk

bug 2661 fixed: there is no more high_filesize in Piwigo 2.4. We have to remove it from history search.



git-svn-id: http://piwigo.org/svn/trunk@16282 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
plegall committed Jul 2, 2012
1 parent 1316c2d commit f4bfc841db2bb371a0deebb9b420019f9092dee9
Showing with 4 additions and 31 deletions.
  1. +4 −31 admin/history.php
@@ -303,7 +303,6 @@
id,
IF(name IS NULL, file, name) AS label,
filesize,
high_filesize,
file,
path,
representative_ext
@@ -313,7 +312,6 @@
// $label_of_image = simple_hash_from_query($query, 'id', 'label');
$label_of_image = array();
$filesize_of_image = array();
$high_filesize_of_image = array();
$file_of_image = array();
$path_of_image = array();
$representative_ext_of_image = array();
@@ -328,17 +326,10 @@
$filesize_of_image[ $row['id'] ] = $row['filesize'];
}
if (isset($row['high_filesize']))
{
$high_filesize_of_image[ $row['id'] ] = $row['high_filesize'];
}
$file_of_image[ $row['id'] ] = $row['file'];
$path_of_image[ $row['id'] ] = $row['path'];
$representative_ext_of_image[ $row['id'] ] = $row['representative_ext'];
}
// echo '<pre>'; print_r($high_filesize_of_image); echo '</pre>';
}
if ($has_tags > 0)
@@ -360,29 +351,11 @@
foreach ($history_lines as $line)
{
// FIXME when we watch the representative of a non image element, it is
// the not the representative filesize that is counted (as it is
// unknown) but the non image element filesize. Proposed solution: add
// #images.representative_filesize and add 'representative' in the
// choices of #history.image_type.
if (isset($line['image_type']))
if (isset($line['image_type']) and $line['image_type'] == 'high')
{
if ($line['image_type'] == 'high')
{
if (isset($high_filesize_of_image[$line['image_id']]))
{
$summary['total_filesize']+=
$high_filesize_of_image[$line['image_id']];
}
}
else
if (isset($filesize_of_image[$line['image_id']]))
{
if (isset($filesize_of_image[$line['image_id']]))
{
$summary['total_filesize']+=
$filesize_of_image[$line['image_id']];
}
$summary['total_filesize'] += $filesize_of_image[$line['image_id']];
}
}
@@ -548,7 +521,7 @@
'%d line filtered', '%d lines filtered',
$page['nb_lines']
),
'FILESIZE' => $summary['total_filesize'].' KB',
'FILESIZE' => $summary['total_filesize'] != 0 ? ceil($summary['total_filesize']/1024).' MB' : '',
'USERS' => l10n_dec(
'%d user', '%d users',
$summary['nb_members'] + $summary['nb_guests']

0 comments on commit f4bfc84

Please sign in to comment.