Merge branch 'master' into groups

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

diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 642d4f880269369e90baefcb43578911d8e802ee..3f4ffc63a0481c79cfc646f218b5721157536de5 100644 (file)
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -23,23 +23,26 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class FavoritesrssAction extends Rss10Action {
+class FavoritesrssAction extends Rss10Action
+{
 
-    var $user = NULL;
+    var $user = null;
     
-    function init() {
+    function init()
+    {
         $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 get_notices($limit=0)
+    {
 
         $user = $this->user;
 
@@ -54,7 +57,8 @@ class FavoritesrssAction extends Rss10Action {
         return $notices;
     }
 
-    function get_channel() {
+    function get_channel()
+    {
         $user = $this->user;
         $c = array('url' => common_local_url('favoritesrss',
                                              array('nickname' =>
@@ -67,7 +71,8 @@ class FavoritesrssAction extends Rss10Action {
         return $c;
     }
 
-    function get_image() {
-        return NULL;
+    function get_image()
+    {
+        return null;
     }
 }
\ No newline at end of file