From: Robin Millette <millette@controlyourself.ca>
Date: Sun, 31 May 2009 21:12:04 +0000 (-0400)
Subject: Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ebeb5f744cbfd5bfea0da1b350a3757865ec4b3b;p=quix0rs-gnu-social.git

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

Conflicts:

	js/util.js
	lib/attachmentlist.php
---

ebeb5f744cbfd5bfea0da1b350a3757865ec4b3b
diff --cc README
index 9207f3e900,db912f2016..76b56a52e5
--- a/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 lib/attachmentlist.php
index a58a50f6fe,559962acca..61749dca57
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@@ -80,15 -80,13 +80,14 @@@ class AttachmentList extends Widge
  
      function show()
      {
 +        $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'));
  
 -        $atts = new File;
 -        $att = $atts->getAttachments($this->notice->id);
          foreach ($att as $n=>$attachment) {
              $item = $this->newListItem($attachment);
              $item->show();