X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=e49ac55401435d9cd0d4d7e262e0eaac9e58adc2;hb=4f3d1e93e97365deac2366bfe422e8301d773a25;hp=26e3f5241eb4888742e27faac378d8d2feeb4d04;hpb=bdd0091e7077e09f1c8eb5dfc2b6e6ff2aa1fb8c;p=quix0rs-gnu-social.git

diff --git a/actions/allrss.php b/actions/allrss.php
index 26e3f5241e..e49ac55401 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -42,19 +42,9 @@ class AllrssAction extends Rss10Action {
 	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');
-
-		$notice->orderBy('created DESC, notice.id DESC');
-		if ($limit != 0) {
-			$notice->limit(0, $limit);
-		}
-		$notice->find();
-
+		
+		$notice = $user->noticesWithFriends(0, $limit);
+											
 		while ($notice->fetch()) {
 			$notices[] = clone($notice);
 		}
@@ -78,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;
 	}