add a script to populate notice inboxes

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

diff --git a/actions/allrss.php b/actions/allrss.php
index a64b47641462494c15624ffe36a820f2d93b5759..e49ac55401435d9cd0d4d7e262e0eaac9e58adc2 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -43,14 +43,8 @@ class AllrssAction extends Rss10Action {
 
                $user = $this->user;
                
-               $notice = $user->noticesWithFriends();
-               
-               if ($limit != 0) {
-                       $notice->limit(0, $limit);
-               }
-               
-               $notice->find();
-
+               $notice = $user->noticesWithFriends(0, $limit);
+                                                                                       
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
@@ -74,6 +68,9 @@ class AllrssAction extends Rss10Action {
        function get_image() {
                $user = $this->user;
                $profile = $user->getProfile();
+               if (!$profile) {
+                       return NULL;
+               }
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                return ($avatar) ? $avatar->url : NULL;
        }