archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r9808 from trunk to branch 2.1

Browse source 
bug 1197 fixed: avoid warning message on history search when a photo was deleted


git-svn-id: http://piwigo.org/svn/branches/2.1@9809 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-03-21 13:25:05 +00:00
parent 62a77c234e
commit 07e5f40ff5
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
admin/history.php
View file

@ -448,12 +448,20 @@ SELECT
)
);
$element = array(
'id' => $line['image_id'],
'file' => $file_of_image[$line['image_id']],
'path' => $path_of_image[$line['image_id']],
'tn_ext' => $tn_ext_of_image[$line['image_id']],
);
if (isset($file_of_image[$line['image_id']]))
{
$element = array(
'id' => $line['image_id'],
'file' => $file_of_image[$line['image_id']],
'path' => $path_of_image[$line['image_id']],
'tn_ext' => $tn_ext_of_image[$line['image_id']],
);
$thumbnail_display = $page['search']['fields']['display_thumbnail'];
}
else
{
$thumbnail_display = 'no_display_thumbnail';
}
$image_title = '('.$line['image_id'].')';
@ -468,7 +476,7 @@ SELECT
$image_string = '';
switch ($page['search']['fields']['display_thumbnail'])
switch ($thumbnail_display)
{
case 'no_display_thumbnail':
{