Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload

Conflicts:

	js/util.js
	lib/attachmentlist.php

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index a58a50f6f..61749dca5 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -83,11 +83,10 @@ class AttachmentList extends Widget
         $atts = new File;
         $att = $atts->getAttachments($this->notice->id);
         if (empty($att)) return 0;
-
-        $this->out->elementStart('dl', array('id' =>'attachment'));
+        $this->out->elementStart('dl', array('id' =>'attachments'));
         $this->out->element('dt', null, _('Attachments'));
         $this->out->elementStart('dd');
-        $this->out->elementStart('ul', array('class' => 'attachments'));
+        $this->out->elementStart('ol', array('class' => 'attachments'));
 
         foreach ($att as $n=>$attachment) {
             $item = $this->newListItem($attachment);
@@ -95,7 +94,7 @@ class AttachmentList extends Widget
         }
 
         $this->out->elementEnd('dd');
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('ol');
         $this->out->elementEnd('dl');
 
         return count($att);