Merge branch '0.8.x' into userdesign

Conflicts:

	actions/showfavorites.php
	lib/action.php

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index c00942af4..e44997004 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -365,7 +365,7 @@ class NoticeListItem extends Widget
         }
         $uploaded = $this->notice->getUploadedAttachment();
         if ($uploaded) {
-            $this->out->element('a', array('href' => $uploaded, 'class' => 'attachment'), $uploaded);
+            $this->out->element('a', array('href' => $uploaded[0], 'class' => 'attachment', 'id' => 'attachment-' . $uploaded[1]), $uploaded[0]);
         }
         $this->out->elementEnd('p');
     }