Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 580bb91f7c889a0fba1789fb87214477e20de3ab..145b51aaea99dfc58cb252c7c1210897dd773a39 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
@@ -25,32 +25,31 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class RepliesrssAction extends Rss10Action
 {
-
     var $user = null;
 
     function prepare($args)
     {
         parent::prepare($args);
         $nickname = $this->trimmed('nickname');
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
             $this->clientError(_('No such user.'));
-            return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
 
     function getNotices($limit=0)
     {
-
         $user = $this->user;
 
         $notice = $user->getReplies(0, ($limit == 0) ? 48 : $limit);
 
         $notices = array();
-        
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -64,24 +63,22 @@ class RepliesrssAction extends Rss10Action
         $c = array('url' => common_local_url('repliesrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: RSS reply feed title. %s is a user nickname.
                    'title' => sprintf(_("Replies to %s"), $user->nickname),
                    'link' => common_local_url('replies',
                                               array('nickname' =>
                                                     $user->nickname)),
-                   'description' => sprintf(_('Replies to %1$s on %2$s!'),
+                   // TRANS: RSS reply feed description.
+                   // TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+                   'description' => sprintf(_('Replies to %1$s on %2$s.'),
                                               $user->nickname, common_config('site', 'name')));
         return $c;
     }
 
     function getImage()
     {
-        $user = $this->user;
-        $profile = $user->getProfile();
-        if (!$profile) {
-            return null;
-        }
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        return ($avatar) ? $avatar->url : null;
+        $profile = $this->user->getProfile();
+        return $profile->avatarUrl(AVATAR_PROFILE_SIZE);
     }
 
     function isReadOnly($args)