Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

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

index 86b0d6f56b2350200cc0402c7e320e90c4103913..982dfde15700863f6fff8da111a7f04376fdb070 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -131,6 +131,13 @@ class PublicAction extends Action
              return _('Public timeline');
          }
      }
+    
+    function extraHead()
+    {
+        parent::extraHead();
+        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
+                                           'content' => common_local_url('publicxrds')));
+    }
  
      /**
       * Output <head> elements for RSS and Atom feeds
@@ -143,14 +150,12 @@ class PublicAction extends Action
          return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
                                _('Public Stream Feed (RSS 1.0)')),
                       new Feed(Feed::RSS2,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'public_timeline.rss')),
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'rss')),
                                _('Public Stream Feed (RSS 2.0)')),
                       new Feed(Feed::ATOM,
-                              common_local_url('api',
-                                               array('apiaction' => 'statuses',
-                                                     'method' => 'public_timeline.atom')),
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'atom')),
                                _('Public Stream Feed (Atom)')));
      }
  
@@ -225,10 +230,10 @@ class PublicAction extends Action
      function showAnonymousMessage()
      {
          if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
-            $m = _('This is %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
+            $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool. ' .
-                   '[Join now](%%%%action.register%%%%) to share notices about yourself with friends, family, and colleagues! ' .
-                   '([Read more](%%%%doc.help%%%%))');
+                   '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ' .
+                   '([Read more](%%doc.help%%))');
          } else {
              $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool.');