X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fattachmentlistitem.php;h=de1087d44cb75f360df589ecd4abfe8ed9566207;hb=0a4eeb89dab241779147c8c02a8f5f0f83533309;hp=133756147c39138cbfc2cf1dab67388cbffbf42f;hpb=883ef2414fbf10797fb9799c5b4099b9f804c761;p=quix0rs-gnu-social.git

diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 133756147c..de1087d44c 100644
--- a/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@ -81,33 +81,36 @@ class AttachmentListItem extends Widget
     function show()
     {
         $this->showStart();
-        $this->showNoticeAttachment();
+        try {
+            $this->showNoticeAttachment();
+        } catch (Exception $e) {
+            $this->element('div', ['class'=>'error'], $e->getMessage());
+            common_debug($e->getMessage());
+        }
         $this->showEnd();
     }
 
     function linkAttr() {
-        return array('class' => 'attachment',
+        return array(
+                     'class' => 'u-url',
                      'href' => $this->attachment->getAttachmentUrl(),
-                     'id' => 'attachment-' . $this->attachment->getID(),
                      'title' => $this->linkTitle());
     }
 
-    function showLink() {
-        $this->out->elementStart('a', $this->linkAttr());
-        $this->out->element('span', null, $this->linkTitle());
-        $this->showRepresentation();
-        $this->out->elementEnd('a');
-    }
-
     function showNoticeAttachment()
     {
-        $this->showLink();
+        $this->showRepresentation();
     }
 
     function showRepresentation() {
         $enclosure = $this->attachment->getEnclosure();
 
         if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) {
+
+            $this->out->elementStart('label');
+            $this->out->element('a', $this->linkAttr(), $this->title());
+            $this->out->elementEnd('label');
+
             if (!empty($enclosure->mimetype)) {
                 // First, prepare a thumbnail if it exists.
                 $thumb = null;
@@ -174,7 +177,7 @@ class AttachmentListItem extends Widget
 
                 default:
                     unset($thumb);  // there's no need carrying this along
-                    switch ($this->attachment->mimetype) {
+                    switch (common_bare_mime($this->attachment->mimetype)) {
                     case 'text/plain':
                         $this->element('div', ['class'=>'e-content plaintext'], file_get_contents($this->attachment->getPath()));
                         break;