Merge branch 'master' into testing

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

diff --git a/actions/tag.php b/actions/tag.php
index 045fac97b52286e1f9839f607ea15ced53840d76..e0cb9783d1e38b3a98adeb1a760f87e6b5a2c290 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -23,6 +23,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 class TagAction extends Action
 {
     var $notice;
+    var $tag;
+    var $page;
 
     function prepare($args)
     {
@@ -55,12 +57,6 @@ class TagAction extends Action
         return true;
     }
 
-    function showSections()
-    {
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
-    }
-
     function title()
     {
         if ($this->page == 1) {
@@ -85,7 +81,15 @@ class TagAction extends Action
 
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineTag',
+                                               array('format' => 'as',
+                                                     'tag' => $this->tag)),
+                              // TRANS: Link label for feed on "notices with tag" page.
+                              // TRANS: %s is the tag the feed is for.
+                              sprintf(_('Notice feed for tag %s (Activity Streams JSON)'),
+                                      $this->tag)),
+                     new Feed(Feed::RSS1,
                               common_local_url('tagrss',
                                                array('tag' => $this->tag)),
                               // TRANS: Link label for feed on "notices with tag" page.