X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Frepliesrss.php;h=7369db5e047ae6f16d8ddbf17f53f512512d0a86;hb=74291968c4b4f1fca29cb79caad695a1e2360734;hp=b5e271585e664fb1df6e1adcc7be427bcc38e418;hpb=33f0d97cf62c7c95f2f4b6ea52044be75e39230c;p=quix0rs-gnu-social.git

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index b5e271585e..7369db5e04 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -30,60 +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 = $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) {
-			while ($reply->fetch()) {
-				$notice = new Notice();
-				$notice->id = $reply->notice_id;
-				$result = $notice->find(true);
-				if (!$result) {
-					continue;
-				}
-				$notices[] = clone($notice);
-			}
-		}
+		$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;
 	}