XMPP daemon updates including help, sub and subsub commands, plus subscribe/unsubcrib...

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

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 0916da00913062c8a03d881c12f92631fbc02558..98a1908abf4851b90134ac663b6c73a2b6e50236 100644 (file)
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -34,13 +34,15 @@ class PublicrssAction extends Rss10Action {
                $user = $this->user;
                $notices = array();
 
-               $notice = DB_DataObject::factory('notice');
+               $notice = new Notice();
 
-               # FIXME: bad performance
+               # XXX: bad performance
 
-               $notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
+               if (common_config('public', 'localonly')) {
+                       $notice->is_local = 1;
+               }
 
-               $notice->orderBy('created DESC');
+               $notice->orderBy('created DESC, notice.id DESC');
 
                if ($limit != 0) {
                        $notice->limit(0, $limit);