diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-08 15:48:52 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-08 15:48:52 -0800 |
| commit | b2e8d8407cc7f1abb5e8767cd3403ac356775eaa (patch) | |
| tree | 5cfaed5f1f21a697e147b41695c7e8c5282324a3 /actions/showstream.php | |
| parent | 3833dc8c1f3f9ba5e3b12bf2715e4a4fb3adabf1 (diff) | |
| parent | 4e6f587f868d71f08c618d0dedf6ddf0331619c2 (diff) | |
Merge branch 'testing' 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)), |