.

diff --git a/docs/NEWS b/docs/NEWS
index 5be0492420123a7ec852b04d149339af58021a76..516dd0cd06336b8cbb0f67024178d208b49ff3d7 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * Fix not showing thumbnail images in media database when thumbSuffix
+      is empty. Thanks to Brian J. France!
+
     * Fix JS errors in admin comment overview for IE6 (garvinhicking)
 
     * Fix showing any entry-id related sidebar plugins, when a selected

diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index b7037851081821a95d1ad4fc5ad5e85615feb909..b7a4852ab26b77984adf6f494707befe3e65b356 100644 (file)
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -86,7 +86,7 @@ switch ($serendipity['GET']['adminAction']) {
                 rename($oldfile, $newfile);
 
                 // Rename thumbnail
-                rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
+                rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' .  $file['extension'],
                        $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
 
                 serendipity_updateImageInDatabase(array('thumbnail_name' => $serendipity['thumbSuffix'], 'name' => $serendipity['GET']['newname']), $serendipity['GET']['fid']);

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 8b5546ef82c2b87712946b7eae9fd4c3b83e4338..35bcd5e769d63b2f0ec4cd3f01e995a241eddf3e 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -95,8 +95,8 @@ function serendipity_updateImageInDatabase($updates, $id) {
 function serendipity_deleteImage($id) {
     global $serendipity;
     $file   = serendipity_fetchImageFromDatabase($id);
-    $dFile  = $file['path'] . $file['name'] .'.'. $file['extension'];
-    $dThumb = $file['path'] . $file['name'] .'.'. $file['thumbnail_name'] .'.'. $file['extension'];
+    $dFile  = $file['path'] . $file['name'] . '.' . $file['extension'];
+    $dThumb = $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension'];
 
     $admin = '';
     if (!serendipity_checkPermission('adminImagesDelete')) {
@@ -391,7 +391,7 @@ function serendipity_rotateImg($id, $degrees) {
     }
 
     $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['extension'];
-    $infileThumb = $outfileThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.'. $file['extension'];
+    $infileThumb = $outfileThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension'];
 
     if ($serendipity['magick'] !== true) {
         serendipity_rotate_image_gd($infile, $outfile, $degrees);
@@ -1028,9 +1028,9 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
         $x = 0;
         foreach ($serendipity['imageList'] as $k => $file) {
             ++$x; $preview = '';
-            $img = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+            $img = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension'];
             $i = @getimagesize($img);
-            $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+            $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension'];
             $is_image = serendipity_isImage($file);
 
             if (!($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || serendipity_checkPermission('adminImagesViewOthers'))) {
@@ -1172,7 +1172,7 @@ function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
                 echo "</li>\n";
 
                 unset($filestack[$file['name'] . '.' . $file['extension']]);
-                unset($filestack[$file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']]);
+                unset($filestack[$file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension']]);
             }
             echo "</ul>\n";
         }

diff --git a/serendipity_admin_image_selector.php b/serendipity_admin_image_selector.php
index ba821b6b9954a24c3a0cd676b74d2cff9b4c0dcb..efd7726d03bfcb4b7e71ad4b2d2a979985a9dc26 100644 (file)
--- a/serendipity_admin_image_selector.php
+++ b/serendipity_admin_image_selector.php
@@ -111,14 +111,14 @@ switch ($serendipity['GET']['step']) {
         }
 
         $file           = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
-        $file['imgsrc'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $file['imgsrc'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension'];
         if ($file['hotlink']) {
             $imgName    = $file['path'];
         } else {
             $imgName    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
         }
 
-        $thumbbasename  = $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $thumbbasename  = $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . '.' . $file['extension'];
 
         if ($file['hotlink']) {
             $thumbName  = $file['path'];