remove 'nudge' -- it won't be in this release

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

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 98a1908abf4851b90134ac663b6c73a2b6e50236..1ab6a8be06aa4214397ce5844a5d536e23fed535 100644 (file)
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -30,29 +30,15 @@ class PublicrssAction extends Rss10Action {
        }
 
        function get_notices($limit=0) {
-
-               $user = $this->user;
+               
                $notices = array();
-
-               $notice = new Notice();
-
-               # XXX: bad performance
-
-               if (common_config('public', 'localonly')) {
-                       $notice->is_local = 1;
-               }
-
-               $notice->orderBy('created DESC, notice.id DESC');
-
-               if ($limit != 0) {
-                       $notice->limit(0, $limit);
-               }
-               $notice->find();
-
+               
+               $notice = Notice::publicStream(0, ($limit == 0) ? 48 : $limit);
+               
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
-
+               
                return $notices;
        }