From 27af3c67a2a9ea856aa2de041a986d452cce3025 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 9 Jun 2009 15:18:12 -0400
Subject: Improve file upload and attachment interface.

---
 lib/common.php     | 1 +
 lib/noticelist.php | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/common.php b/lib/common.php
index ceb50337c..5aafdfe0e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -188,6 +188,7 @@ $config =
             'application/vnd.oasis.opendocument.formula-template',
             'application/vnd.oasis.opendocument.text-master',
             'application/vnd.oasis.opendocument.text-web',
+            'application/x-zip',
             'application/zip',
             'text/plain',
             'video/mpeg',
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 5513e317e..9ace341d8 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -364,6 +364,10 @@ class NoticeListItem extends Widget
             // versions (>> 0.4.x)
             $this->out->raw(common_render_content($this->notice->content, $this->notice));
         }
+        $uploaded = $this->notice->getUploadedAttachment();
+        if ($uploaded) {
+            $this->out->element('a', array('href' => $uploaded, 'class' => 'attachment'), $uploaded);
+        }
         $this->out->elementEnd('p');
     }
 
@@ -395,10 +399,6 @@ class NoticeListItem extends Widget
                                           'title' => $dt),
                             common_date_string($this->notice->created));
 
-        $f2p = File_to_post::staticGet('post_id', $this->notice->id);
-        if (!empty($f2p)) {
-            $this->out->text(_(' (with attachments) '));
-        }
         $this->out->elementEnd('a');
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');
-- 
cgit v1.2.3-54-g00ecf