Merge branch 'master' of ../trunk

2 files changed, 8 insertions, 7 deletions

diff --git a/actions/allrss.php b/actions/allrss.php
index e357d12f0..248f59f43 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -49,7 +49,6 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class AllrssAction extends Rss10Action
 {
-
     var $user = null;
 
     /**
@@ -57,8 +56,9 @@ class AllrssAction extends Rss10Action
      * 
      * @return boolean false if user doesn't exist
      */
-    function init()
+    function prepare($args)
     {
+        parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
 
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 43be133a4..48c4fa255 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -28,8 +28,9 @@ 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);
 
@@ -41,7 +42,7 @@ class RepliesrssAction extends Rss10Action
         }
     }
 
-    function get_notices($limit=0)
+    function getNotices($limit=0)
     {
 
         $user = $this->user;
@@ -57,7 +58,7 @@ class RepliesrssAction extends Rss10Action
         return $notices;
     }
 
-    function get_channel()
+    function getChannel()
     {
         $user = $this->user;
         $c = array('url' => common_local_url('repliesrss',
@@ -71,7 +72,7 @@ class RepliesrssAction extends Rss10Action
         return $c;
     }
 
-    function get_image()
+    function getImage()
     {
         $user = $this->user;
         $profile = $user->getProfile();
@@ -81,4 +82,4 @@ class RepliesrssAction extends Rss10Action
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
         return ($avatar) ? $avatar->url : null;
     }
-}
\ No newline at end of file
+}