backport

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index d6a89c355c25add4e5424845bcbf34225869b522..18a8a4fe5c88785e22e1e6b0e4b41a06dd0c2de7 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1102,11 +1102,16 @@ if ( !$manage ) {
 }
 } // End serendipity_displayImageList()
 
-function serendipity_isImage(&$file) {
+function serendipity_isImage(&$file, $strict = false) {
+    global $serendipity;
+
     $file['displaymime'] = $file['mime'];
 
+    // Strip HTTP path out of imgsrc
+    $file['location'] = $serendipity['serendipityPath'] . preg_replace('@^(' . preg_quote($serendipity['serendipityHTTPPath']) . ')@i', '', $file['imgsrc']);
+
     // File is PDF -> Thumb is PNG
-    if ($file['mime'] == 'application/pdf') {
+    if ($file['mime'] == 'application/pdf' && file_exists($file['location'] . '.png') && $strict == false) {
         $file['imgsrc']     .= '.png';
         $file['displaymime'] = 'image/png';
     }

diff --git a/serendipity_admin_image_selector.php b/serendipity_admin_image_selector.php
index cdafd981872b41f854ef6a76e0910ee83a3bf526..0295eeade1d75753427e59b5c59b53d6a31de363 100644 (file)
--- a/serendipity_admin_image_selector.php
+++ b/serendipity_admin_image_selector.php
@@ -95,7 +95,7 @@ switch ($serendipity['GET']['step']) {
             $thumbName  = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $thumbbasename;
         }
         $thumbsize     = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
-        $is_image      = serendipity_isImage($file);
+        $is_image      = serendipity_isImage($file, true);
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>