diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-02-10 11:09:03 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-02-10 11:09:03 +0000 |
| commit | 3d0bc1a3dd16826bf89286f37aa3778e93a34b6b (patch) | |
| tree | 917cbd6dde0d9b47497def39e9dcf12e5433e544 /actions/showstream.php | |
| parent | f3c2dfacf4b3b1ce44edcb82d8e76e75e2b7c9fa (diff) | |
| parent | e8428d1d525677fa116236735a43e7b49e8a3fd3 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 07cc68b76..f9407e35a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -131,14 +131,14 @@ class ShowstreamAction extends ProfileAction new Feed(Feed::RSS2, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->nickname, + 'id' => $this->user->id, 'format' => 'rss')), sprintf(_('Notice feed for %s (RSS 2.0)'), $this->user->nickname)), new Feed(Feed::ATOM, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->nickname, + 'id' => $this->user->id, 'format' => 'atom')), sprintf(_('Notice feed for %s (Atom)'), $this->user->nickname)), |