Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Conflicts:
	actions/public.php

1 files changed, 11 insertions, 0 deletions

diff --git a/actions/public.php b/actions/public.php
index 27153f131..d2f9da646 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -136,6 +136,17 @@ class PublicAction extends Action
     }
 
     /**
+     * Output document relationship links
+     *
+     * @return void
+     */
+    function showRelationshipLinks()
+    {
+        $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
+                                     $this->page, 'public');
+    }
+
+    /**
      * Extra head elements
      *
      * We include a <meta> element linking to the publicxrds page, for OpenID