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 081360a59725d6b647c928ea2624952080e045e8..26e3f5241eb4888742e27faac378d8d2feeb4d04 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -30,51 +30,51 @@ class AllrssAction extends Rss10Action {
        function init() {
                $nickname = $this->trimmed('nickname');
                $this->user = User::staticGet('nickname', $nickname);
-               
+
                if (!$this->user) {
-                       common_user_error(_t('No such nickname.'));
+                       common_user_error(_('No such user.'));
                        return false;
                } else {
                        return true;
                }
        }
-       
+
        function get_notices($limit=0) {
-               
+
                $user = $this->user;
                $notices = array();
-               
+
                $notice = DB_DataObject::factory('notice');
 
                $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);
                }
                $notice->find();
-               
+
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
-               
+
                return $notices;
        }
-       
+
        function get_channel() {
                $user = $this->user;
                $c = array('url' => common_local_url('allrss',
-                                                                                        array('nickname' => 
+                                                                                        array('nickname' =>
                                                                                                   $user->nickname)),
-                                  'title' => $user->nickname . _t(' and friends'),
+                                  'title' => sprintf(_('%s and friends'), $user->nickname),
                                   'link' => common_local_url('all',
                                                                                         array('nickname' =>
                                                                                                   $user->nickname)),
-                                  'description' => _t('Feed for friends of ') . $user->nickname);
+                                  'description' => sprintf(_('Feed for friends of %s'), $user->nickname));
                return $c;
        }
-       
+
        function get_image() {
                $user = $this->user;
                $profile = $user->getProfile();