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/apitimelineuser.php | |
| parent | 3833dc8c1f3f9ba5e3b12bf2715e4a4fb3adabf1 (diff) | |
| parent | 4e6f587f868d71f08c618d0dedf6ddf0331619c2 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/apitimelineuser.php')
| -rw-r--r-- | actions/apitimelineuser.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 830b16941..ed9104905 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -145,10 +145,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction ); break; case 'atom': - if (isset($apidata['api_arg'])) { + $id = $this->arg('id'); + if ($id) { $selfuri = common_root_url() . 'api/statuses/user_timeline/' . - $apidata['api_arg'] . '.atom'; + rawurlencode($id) . '.atom'; } else { $selfuri = common_root_url() . 'api/statuses/user_timeline.atom'; |