Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/tagrss.php b/actions/tagrss.php
index 135b12135d84dad523482d16a3a2e758bba5ed34..286d1688579513a16ae4bf1aa9c57eb62aacae83 100644 (file)
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,42 +17,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/rssaction.php');
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 // Formatting of RSS handled by Rss10Action
 
 class TagrssAction extends Rss10Action
 {
-    var $tag;
+    protected $tag;
 
-    function prepare($args) {
-        parent::prepare($args);
+    protected function doStreamPreparation()
+    {
         $tag = common_canonical_tag($this->trimmed('tag'));
-        $this->tag = Notice_tag::staticGet('tag', $tag);
-        if (!$this->tag) {
+        $this->tag = Notice_tag::getKV('tag', $tag);
+        if (!$this->tag instanceof Notice_tag) {
+            // TRANS: Client error when requesting a tag feed for a non-existing tag.
             $this->clientError(_('No such tag.'));
-            return false;
-        } else {
-            return true;
         }
     }
 
-    function getNotices($limit=0)
+    protected function getNotices()
     {
-        $tag = $this->tag;
-
-        if (is_null($tag)) {
-            return null;
-        }
-
-        $notice = Notice_tag::getStream($tag->tag, 0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
-
-        return $notices;
+        $stream = Notice_tag::getStream($this->tag->tag)->getNotices(0, $this->limit);
+        return $stream->fetchAll();
     }
 
     function getChannel()
@@ -61,12 +47,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;
     }