allow mimetype icons

diff --git a/docs/NEWS b/docs/NEWS
index 820ed308a00c97968c5ff68ed8d71fbf141735ea..a9ba41b281f888b894c29ff5de60f3c3687e4b92 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,10 @@
 Version 1.1-alpha1()
 ------------------------------------------------------------------------
 
+   * Media manager gallery will use (user-specified) 
+     "admin/img/mime_XXX-YYY.png" images of a template for non-image 
+     mimetypes. (garvinhicking)
+
    * Allow entryproperties plugin to define which markup plugins are
      applied per-entry (garvinhicking)
 

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 258606f51881659195c7e6f4a9548d1d4f6e627d..a382354c952ace9c41655959b5cefde9df3ee9f5 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1404,7 +1404,11 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
                 }
             /* If it's not an image, or the thumbnail does not exist */
             } else {
-                $preview .= '<img src="'. serendipity_getTemplateFile('admin/img/mime_unknown.png') .'" title="' . $file['path'] . $file['name'] . ' (' . $file['mime'] . ')" alt="'. $file['mime'] .'" /><br /><span style="font-weight: bold; font-size: 8pt">- ' . (($file['hotlink']) ? MEDIA_HOTLINKED : $file['mime']) .' -</span>';
+                $mimeicon = serendipity_getTemplateFile('admin/img/mime_' . preg_replace('@[^a-z0-9\-\_]@i', '-', $file['mime']) . '.png');
+                if (!$mimeicon) {
+                    $mimeicon = serendipity_getTemplateFile('admin/img/mime_unknown.png');
+                }
+                $preview .= '<img src="'. $mimeicon .'" title="' . $file['path'] . $file['name'] . ' (' . $file['mime'] . ')" alt="'. $file['mime'] .'" /><br /><span style="font-weight: bold; font-size: 8pt">- ' . (($file['hotlink']) ? MEDIA_HOTLINKED : $file['mime']) .' -</span>';
                 if ($url) {
                     $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>';
                 }