[php-blog-cvs] serendipity/include functions_images.inc.php,1.32,1.33

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24095

Modified Files:
	functions_images.inc.php 
Log Message:
- This makes more sense, since media can be an image, and still have a missing thumbnail


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- functions_images.inc.php	15 Feb 2005 23:28:54 -0000	1.32
+++ functions_images.inc.php	15 Feb 2005 23:34:45 -0000	1.33
@@ -906,12 +906,18 @@
             $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
             $is_image = serendipity_isImage($file);
 
-            if ($is_image) {
+            /* If it is an image, and the thumbnail exists */
+            if ($is_image && file_exists($file['imgsrc'])) {
                 $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';
-                if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
-            } elseif (!file_exists($file['imgsrc'])) {
+                if ($url) {
+                    $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>';
+                }
+            /* If it's not an image, or the thumbnail does not exist */
+            } else {
                 $preview .= '<img src="'. serendipity_getTemplateFile('admin/img/mime_unknown.png') .'" alt="'. $file['mime'] .'" /><br /><span style="font-weight: bold; font-size: 8pt">- ' . $file['mime'] .' -</span>';
-                if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
+                if ($url) {
+                    $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>';
+                }
                 $preview .= '</div>';
             }
 ?>