aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-03-21 13:24:02 +0000
committerplegall <plg@piwigo.org>2011-03-21 13:24:02 +0000
commit00165690244af4c05097566b952a4e568f2eb1af (patch)
tree8a1c862e4854370d28fa98a6704e943161da2d71 /admin
parentb6c8d06acfb74c050ee907edb2e263ff0cd5b6c3 (diff)
bug 1197 fixed: avoid warning message on history search when a photo was deleted
git-svn-id: http://piwigo.org/svn/trunk@9808 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/history.php22
1 files changed, 15 insertions, 7 deletions
diff --git a/admin/history.php b/admin/history.php
index df5c3d67d..cbc4a2cdf 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -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':
{