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

Conflicts:

	js/util.js
	lib/attachmentlist.php

diff --cc README
index 9207f3e900ddfa8251d530ac44e8c7e782fc6b7c,db912f201616bff07dc0807a088111fe48484818..76b56a52e5a869cddd54539bef9849a0e1decc02
--- 1/README
--- 2/README
+++ b/README
@@@ -1162,6 -1196,6 +1196,21 @@@ reporturl: URL to post statistics to. D
             set 'run' to 'never' than to set this value to something
             nonsensical.
  
++
++attachments
++-----------
++
++The software lets users upload files with their notices. You can configure
++the types of accepted files by mime types and a trio of quota options:
++per file, per user (total), per user per month.
++
++supported: an array of mime types you accept to store and distribute,
++           like 'image/gif', 'video/mpeg', 'audio/mpeg', etc.
++file_quota: maximum size for a single file upload in bytes.
++user_quota: total size in bytes a user can store.
++monthly_quota: total size permitted in the current month.
++
++
  Troubleshooting
  ===============
  

diff --cc js/util.js
Simple merge

diff --cc lib/attachmentlist.php
index a58a50f6fe9cfa8d109d7559227bcf500d1dc4fc,559962accab60e4614f35773001a22182c5fb734..61749dca578a1cf0688bb2290b26217990b37dd1
--- 1/lib/attachmentlist.php
--- 2/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@@ -80,15 -80,13 +80,14 @@@ class AttachmentList extends Widge
  
      function show()
      {
- 
-         $this->out->elementStart('dl', array('id' =>'attachment'));
 +        $atts = new File;
 +        $att = $atts->getAttachments($this->notice->id);
 +        if (empty($att)) return 0;
+         $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'));
  
 -        $atts = new File;
 -        $att = $atts->getAttachments($this->notice->id);
          foreach ($att as $n=>$attachment) {
              $item = $this->newListItem($attachment);
              $item->show();

diff --cc lib/common.php
Simple merge

diff --cc lib/noticelist.php
Simple merge