Merge branch '0.8.x' into userdesign

Conflicts:

	actions/showfavorites.php
	lib/action.php

diff --combined actions/replies.php
index 5d84f6428cfac4aec8bf75e807107801f7974118,eac4d0a3aeeda3622eec4bcbaec8a787fbbe82ac..d7ed440e9237d0a32fd814eb1dd99269ad6393f9
--- 1/actions/replies.php
--- 2/actions/replies.php
+++ b/actions/replies.php
@@@ -45,8 -45,9 +45,8 @@@ require_once INSTALLDIR.'/lib/feedlist.
   * @link     http://laconi.ca/
   */
  
 -class RepliesAction extends Action
 +class RepliesAction extends OwnerDesignAction
  {
 -    var $user = null;
      var $page = null;
  
      /**
@@@ -137,17 -138,6 +137,6 @@@
          return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
      }
  
-     /**
-      * Output document relationship links
-      *
-      * @return void
-      */
-     function showRelationshipLinks()
-     {
-         $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                      $this->page, 'replies', array('nickname' => $this->user->nickname));
-     }
- 
      /**
       * show the personal group nav
       *

diff --combined lib/noticelist.php
index c00942af4998226b3bdee957b29f849486005b1f,fadc238a4db17685668b16e68631d3959045a61a..e44997004519a11978430cf4ebeff56719ddd784
--- 1/lib/noticelist.php
--- 2/lib/noticelist.php
+++ b/lib/noticelist.php
@@@ -50,6 -50,7 +50,6 @@@ require_once INSTALLDIR.'/lib/attachmen
   * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
   * @link     http://laconi.ca/
   * @see      Notice
 - * @see      StreamAction
   * @see      NoticeListItem
   * @see      ProfileNoticeList
   */
@@@ -365,7 -366,7 +365,7 @@@ class NoticeListItem extends Widge
          }
          $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');
      }