summaryrefslogtreecommitdiff
path: root/actions/showstream.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-05-19 01:08:28 +0000
committerZach Copley <zach@controlyourself.ca>2009-05-19 01:08:28 +0000
commit4186dd2691bf4f6d0ddbf74e385dca00018747be (patch)
treea0a60918127e426ddf1d8d3bd4535d486e0b8b51 /actions/showstream.php
parent35b39342337fed5916e06876c8a37068d2052937 (diff)
parent8c5d1b63df63bdf73ef08f8b8c46699089939fc8 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'actions/showstream.php')
-rw-r--r--actions/showstream.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 1654f589c..678a3174c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -113,6 +113,15 @@ class ShowstreamAction extends ProfileAction
function getFeeds()
{
+ if (!empty($this->tag)) {
+ return array(new Feed(Feed::RSS1,
+ common_local_url('userrss',
+ array('nickname' => $this->user->nickname,
+ 'tag' => $this->tag)),
+ sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'),
+ $this->user->nickname, $this->tag)));
+ }
+
return array(new Feed(Feed::RSS1,
common_local_url('userrss',
array('nickname' => $this->user->nickname)),