utility for getting avatar or default avatar

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

diff --git a/actions/allrss.php b/actions/allrss.php
index e9280024c4886bf09d51b660695ae9970437534f..26e3f5241eb4888742e27faac378d8d2feeb4d04 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -32,7 +32,7 @@ class AllrssAction extends Rss10Action {
                $this->user = User::staticGet('nickname', $nickname);
 
                if (!$this->user) {
-                       common_user_error(_('No such nickname.'));
+                       common_user_error(_('No such user.'));
                        return false;
                } else {
                        return true;
@@ -49,7 +49,7 @@ class AllrssAction extends Rss10Action {
                $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR');
                $notice->whereAdd('profile_id = ' . $user->id, 'OR');
 
-               $notice->orderBy('created DESC');
+               $notice->orderBy('created DESC, notice.id DESC');
                if ($limit != 0) {
                        $notice->limit(0, $limit);
                }