moving delete profile to its own space.

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

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 923ed34f86b8166382fbdce5841ad010b1a6ef1f..7369db5e047ae6f16d8ddbf17f53f512512d0a86 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -30,65 +30,49 @@ class RepliesrssAction 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();
 
-               $reply = new Reply();
-               $reply->profile_id = $this->user->id;
-               $reply->orderBy('modified DESC');
-               if ($limit) {
-                       $reply->limit(0, $limit);
-               }
-               
-               $cnt = $reply->find();
+               $notice = $user->getReplies(0, ($limit == 0) ? 48 : $limit);
 
-               if ($cnt > 0) {
-                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                               if ($reply->fetch()) {
-                                       $notice = new Notice();
-                                       $notice->id = $reply->notice_id;
-                                       $result = $notice->find(true);
-                                       if (!$result) {
-                                               continue;
-                                       }
-                                       $notices[] = clone($notice);
-                               } else {
-                                       // shouldn't happen!
-                                       break;
-                               }
-                       }
-               }
+               $notices = array();
                
+               while ($notice->fetch()) {
+                       $notices[] = clone($notice);
+               }
+
                return $notices;
        }
-       
+
        function get_channel() {
                $user = $this->user;
                $c = array('url' => common_local_url('repliesrss',
-                                                                                        array('nickname' => 
+                                                                                        array('nickname' =>
                                                                                                   $user->nickname)),
-                                  'title' => _t("Replies to ") . $profile->nickname,
+                                  'title' => sprintf(_("Replies to %s"), $user->nickname),
                                   'link' => common_local_url('replies',
                                                                                          array('nickname' =>
                                                                                                        $user->nickname)),
-                                  'description' => _t('Feed for replies to ') . $user->nickname);
+                                  'description' => sprintf(_('Feed for replies to %s'), $user->nickname));
                return $c;
        }
-       
+
        function get_image() {
                $user = $this->user;
                $profile = $user->getProfile();
+               if (!$profile) {
+                       return NULL;
+               }
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                return ($avatar) ? $avatar->url : NULL;
        }