Misses this file to merge. I like the comments.

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

diff --git a/actions/tagrss.php b/actions/tagrss.php
index 75cbfa274b58bc0ed54c24ce26976ad6cbf7ba4f..62ca3a81d73934a32a4341850f1dbfa0ddb1745a 100644 (file)
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -22,19 +22,19 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
-
 class TagrssAction extends Rss10Action
 {
     var $tag;
 
-    function prepare($args) {
+    function prepare(array $args=array()) {
         parent::prepare($args);
         $tag = common_canonical_tag($this->trimmed('tag'));
-        $this->tag = Notice_tag::staticGet('tag', $tag);
+        $this->tag = Notice_tag::getKV('tag', $tag);
         if (!$this->tag) {
+            // TRANS: Client error when requesting a tag feed for a non-existing tag.
             $this->clientError(_('No such tag.'));
-            return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
@@ -61,12 +61,14 @@ class TagrssAction extends Rss10Action
         $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
                'title' => $tagname,
                'link' => common_local_url('tagrss', array('tag' => $tagname)),
+               // TRANS: Tag feed description.
+               // TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
                'description' => sprintf(_('Updates tagged with %1$s on %2$s!'),
                                         $tagname, common_config('site', 'name')));
         return $c;
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }