diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
| commit | 32084e33a266797b306158df29e48f057651b410 (patch) | |
| tree | 2a46e529783c8547aaae8ac00c8cac9bdfa61490 /actions/showstream.php | |
| parent | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (diff) | |
| parent | d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
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 958676104..5a9add36c 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)), |