Merge branch 'master' of gitorious.org:statusnet/mainline

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index 7bcdd3fae208de3eb1c175cb743b07a9a3aa4057..8c724466368624ab98932f9e6179852b70fd4876 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -159,6 +159,11 @@ class PublicAction extends Action
         $this->element('link', array('rel' => 'EditURI',
                                      'type' => 'application/rsd+xml',
                                      'href' => $rsd));
+
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => common_local_url('public')));
+        }
     }
 
     /**