Merge branch 'master' of /var/www/mublog

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

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 9652ae9ea60faafbd94c2e02afddbc30f375ab8d..48c4fa2553afd5639fb74de6cc971be2970c0848 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -23,23 +23,27 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class RepliesrssAction extends Rss10Action {
+class RepliesrssAction extends Rss10Action
+{
 
     var $user = null;
 
-    function init() {
+    function prepare($args)
+    {
+        parent::prepare($args);
         $nickname = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return false;
         } else {
             return true;
         }
     }
 
-    function get_notices($limit=0) {
+    function getNotices($limit=0)
+    {
 
         $user = $this->user;
 
@@ -54,7 +58,8 @@ class RepliesrssAction extends Rss10Action {
         return $notices;
     }
 
-    function get_channel() {
+    function getChannel()
+    {
         $user = $this->user;
         $c = array('url' => common_local_url('repliesrss',
                                              array('nickname' =>
@@ -67,7 +72,8 @@ class RepliesrssAction extends Rss10Action {
         return $c;
     }
 
-    function get_image() {
+    function getImage()
+    {
         $user = $this->user;
         $profile = $user->getProfile();
         if (!$profile) {
@@ -76,4 +82,4 @@ class RepliesrssAction extends Rss10Action {
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
         return ($avatar) ? $avatar->url : null;
     }
-}
\ No newline at end of file
+}