X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublicrss.php;h=1ab6a8be06aa4214397ce5844a5d536e23fed535;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=0cf572dbe7aaa7d74665ac1006c889bc20db43c7;hpb=735b8ddc676cc7d85ca4256994755e61ea6023a1;p=quix0rs-gnu-social.git

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 0cf572dbe7..1ab6a8be06 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -28,20 +28,12 @@ class PublicrssAction extends Rss10Action {
 	function init() {
 		return true;
 	}
-	
+
 	function get_notices($limit=0) {
 		
-		$user = $this->user;
 		$notices = array();
 		
-		$notice = DB_DataObject::factory('notice');
-		
-		$notice->orderBy('created DESC');
-		
-		if ($limit != 0) {
-			$notice->limit(0, $limit);
-		}
-		$notice->find();
+		$notice = Notice::publicStream(0, ($limit == 0) ? 48 : $limit);
 		
 		while ($notice->fetch()) {
 			$notices[] = clone($notice);
@@ -49,16 +41,16 @@ class PublicrssAction extends Rss10Action {
 		
 		return $notices;
 	}
-	
+
 	function get_channel() {
 		global $config;
 		$c = array('url' => common_local_url('publicrss'),
-				   'title' => $config['site']['name'] . _t(' Public Stream'),
+				   'title' => sprintf(_('%s Public Stream'), $config['site']['name']),
 				   'link' => common_local_url('public'),
-				   'description' => _t('All updates for ') . $config['site']['name']);
+				   'description' => sprintf(_('All updates for %s'), $config['site']['name']));
 		return $c;
 	}
-	
+
 	function get_image() {
 		return NULL;
 	}