Changeset 9809


Ignore:
Timestamp:
Mar 21, 2011, 2:25:05 PM (10 years ago)
Author:
plg
Message:

merge r9808 from trunk to branch 2.1

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/admin/history.php

    r6364 r9809  
    449449        );
    450450
    451       $element = array(
    452            'id' => $line['image_id'],
    453            'file' => $file_of_image[$line['image_id']],
    454            'path' => $path_of_image[$line['image_id']],
    455            'tn_ext' => $tn_ext_of_image[$line['image_id']],
    456            );
     451      if (isset($file_of_image[$line['image_id']]))
     452      {
     453        $element = array(
     454          'id' => $line['image_id'],
     455          'file' => $file_of_image[$line['image_id']],
     456          'path' => $path_of_image[$line['image_id']],
     457          'tn_ext' => $tn_ext_of_image[$line['image_id']],
     458          );
     459        $thumbnail_display = $page['search']['fields']['display_thumbnail'];
     460      }
     461      else
     462      {
     463        $thumbnail_display = 'no_display_thumbnail';
     464      }
    457465
    458466      $image_title = '('.$line['image_id'].')';
     
    469477      $image_string = '';
    470478
    471       switch ($page['search']['fields']['display_thumbnail'])
     479      switch ($thumbnail_display)
    472480      {
    473481        case 'no_display_thumbnail':
Note: See TracChangeset for help on using the changeset viewer.