X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fallrss.php;h=e49ac55401435d9cd0d4d7e262e0eaac9e58adc2;hb=0625f18c8e29bd840546136abe9e869b145fc497;hp=64e16ec6cb6e42c26f6f385eb756640ab126373b;hpb=87b494f1ebbe7640d194ef322af12fdf378295df;p=quix0rs-gnu-social.git

diff --git a/actions/allrss.php b/actions/allrss.php
index 64e16ec6cb..e49ac55401 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -30,38 +30,28 @@ class AllrssAction extends Rss10Action {
 	function init() {
 		$nickname = $this->trimmed('nickname');
 		$this->user = User::staticGet('nickname', $nickname);
-		
+
 		if (!$this->user) {
-			common_user_error(_('No such nickname.'));
+			common_user_error(_('No such user.'));
 			return false;
 		} else {
 			return true;
 		}
 	}
-	
-	function get_notices($limit=0) {
-		
-		$user = $this->user;
-		$notices = array();
-		
-		$notice = DB_DataObject::factory('notice');
 
-		$notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR');
-		$notice->whereAdd('profile_id = ' . $user->id, 'OR');
+	function get_notices($limit=0) {
 
-		$notice->orderBy('created DESC');
-		if ($limit != 0) {
-			$notice->limit(0, $limit);
-		}
-		$notice->find();
+		$user = $this->user;
 		
+		$notice = $user->noticesWithFriends(0, $limit);
+											
 		while ($notice->fetch()) {
 			$notices[] = clone($notice);
 		}
-		
+
 		return $notices;
 	}
-	
+
 	function get_channel() {
 		$user = $this->user;
 		$c = array('url' => common_local_url('allrss',
@@ -74,10 +64,13 @@ class AllrssAction extends Rss10Action {
 				   'description' => sprintf(_('Feed for friends of %s'), $user->nickname));
 		return $c;
 	}
-	
+
 	function get_image() {
 		$user = $this->user;
 		$profile = $user->getProfile();
+		if (!$profile) {
+			return NULL;
+		}
 		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 		return ($avatar) ? $avatar->url : NULL;
 	}