X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftagrss.php;h=0d4d68ffba1c4c7594ab12b90a75eb6b0c38ac52;hb=7d524307d247d15687065be75f4524bc9e638a2b;hp=5f4831d2214e9a500c0d9ea36366670955cd6f48;hpb=513c54fa89085fde783a73c298d61576f834b131;p=quix0rs-gnu-social.git

diff --git a/actions/tagrss.php b/actions/tagrss.php
index 5f4831d221..0d4d68ffba 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,43 +17,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { 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 {
-            $this->notices = $this->getNotices($this->limit);
-            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()