lib/ping.php - Fix PHP 7.3 Warning switch continue -> break

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

diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 934c5f74dd2cbe9ff972ec9d0ffe21800a9bac30..de1087d44cb75f360df589ecd4abfe8ed9566207 100644 (file)
--- 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;