Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/inlineattachmentlist.php b/lib/inlineattachmentlist.php
index b68701fb31266f570ead2a3d69603d8cba9baf32..a8f383c3fe80b2a5e0191d4e57238dc14abfd545 100644 (file)
--- a/lib/inlineattachmentlist.php
+++ b/lib/inlineattachmentlist.php
@@ -35,12 +35,7 @@ class InlineAttachmentList extends AttachmentList
 {
     function showListStart()
     {
-        $this->out->elementStart('div', array('class' => 'attachments'));
-    }
-
-    function showListEnd()
-    {
-        $this->out->elementEnd('div');
+        parent::showListStart();
     }
 
     /**
@@ -59,7 +54,6 @@ class InlineAttachmentList extends AttachmentList
 class InlineAttachmentListItem extends AttachmentListItem
 {
     function showLink() {
-        $this->out->element('a', $this->linkAttr(), $this->title());
         $this->showRepresentation();
     }
 
@@ -72,7 +66,7 @@ class InlineAttachmentListItem extends AttachmentListItem
     {
         // XXX: RDFa
         // TODO: add notice_type class e.g., notice_video, notice_image
-        $this->out->elementStart('span', array('class' => 'inline-attachment'));
+        $this->out->elementStart('li', array('class' => 'inline-attachment'));
     }
 
     /**
@@ -84,6 +78,6 @@ class InlineAttachmentListItem extends AttachmentListItem
      */
     function showEnd()
     {
-        $this->out->elementEnd('span');
+        $this->out->elementEnd('li');
     }
 }