Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / attachmentlist.php

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 19ca5711c8c2ab7e3eff437d5e8cd050f8d79623..4e39e59ca59519c00ea804ce9ab7e2c4496aa692 100644 (file)
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -75,10 +75,9 @@ class AttachmentList extends Widget
     function show()
     {
        $attachments = $this->notice->attachments();
-        $representable = false;
         foreach ($attachments as $key=>$att) {
-            // Only show attachments representable with a title
-            if ($att->getTitle() === null) {
+            // Remove attachments which are not representable with neither a title nor thumbnail
+            if ($att->getTitle() === null && !$att->hasThumbnail()) {
                 unset($attachments[$key]);
             }
         }