X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublicrss.php;h=185a4ff785f192c90202a70f0680485579df0256;hb=e440b9cea02549032ba4f79c43964219dea23d82;hp=93314ee326dda0a03eeb51f66fcf76f26c9433c2;hpb=1d8aa56808d2208021bd913b86e720f7ae72c231;p=quix0rs-gnu-social.git

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 93314ee326..185a4ff785 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -28,41 +28,41 @@ class PublicrssAction extends Rss10Action {
 	function init() {
 		return true;
 	}
-	
+
 	function get_notices($limit=0) {
-		
+
 		$user = $this->user;
 		$notices = array();
-		
-		$notice = DB_DataObject::factory('notice');
-
-		# FIXME: bad performance
-		
-		$notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
-		
-		$notice->orderBy('created DESC');
-		
+
+		$notice = new Notice();
+
+		# XXX: bad performance
+
+		$notice->is_local = 1;
+
+		$notice->orderBy('created DESC, notice.id DESC');
+
 		if ($limit != 0) {
 			$notice->limit(0, $limit);
 		}
 		$notice->find();
-		
+
 		while ($notice->fetch()) {
 			$notices[] = clone($notice);
 		}
-		
+
 		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;
 	}