Merge branch '0.8.x' into userdesign

Conflicts:

	actions/showfavorites.php
	lib/action.php

1 files changed, 0 insertions, 16 deletions

diff --git a/actions/tag.php b/actions/tag.php
index e9351d241..d0ad797eb 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -76,22 +76,6 @@ class TagAction extends Action
                               sprintf(_('Feed for tag %s'), $this->tag)));
     }
 
-    /**
-     * Output document relationship links
-     *
-     * @return void
-     */
-    function showRelationshipLinks()
-    {
-        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
-                                     $this->page, 'tag', array('tag' => $this->tag));
-    }
-
-    function showPageNotice()
-    {
-        return sprintf(_('Messages tagged "%s", most recent first'), $this->tag);
-    }
-
     function showContent()
     {
         $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);