fix query and description for allrss

darcs-hash:20080522114839-84dde-bdf5f244766b198932a068d6c80a667943a03f54.gz
This commit is contained in:
Evan Prodromou 2008-05-22 07:48:39 -04:00
parent 735b8ddc67
commit b2903983bd

View File

@ -46,7 +46,7 @@ class AllrssAction extends Rss10Action {
$notice = DB_DataObject::factory('notice');
$notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR');
$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');
@ -71,7 +71,7 @@ class AllrssAction extends Rss10Action {
'link' => common_local_url('all',
array('nickname' =>
$user->nickname)),
'description' => _t('Microblog feed for ') . $user->nickname);
'description' => _t('Feed for friends of ') . $user->nickname);
return $c;
}