X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=9cbfe8dc8f2c58b5d4829bc8b7433cc039c8f891;hb=16daa87a392bc503ff7c07773618893f581dc982;hp=86d98284ebdded584d0f83d636e52606a6f0bb68;hpb=b104da04fbcdc39faae42b4a714b730e3e1b05f5;p=quix0rs-gnu-social.git

diff --git a/actions/allrss.php b/actions/allrss.php
index 86d98284eb..9cbfe8dc8f 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');
-		if ($limit != 0) {
-			$notice->limit(0, $limit);
-		}
-		$notice->find();
-
+		
+		$notice = $user->noticesWithFriends(0, $limit);
+											
 		while ($notice->fetch()) {
 			$notices[] = clone($notice);
 		}