diff options
| author | Zach Copley <zach@status.net> | 2010-03-12 01:40:52 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-12 01:40:52 +0000 |
| commit | e1537d83871811cf3446a592e44f56d26e961afe (patch) | |
| tree | 52e0cec4556352d04d71b1fc441087c8863a284e /actions | |
| parent | 78f0d6bbd21ed84733e960201c4652e69c565450 (diff) | |
More generalized method for calculating Atom rel="self" links
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/apitimelinegroup.php | 8 | ||||
| -rw-r--r-- | actions/apitimelineuser.php | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index c4f8cbc65..da816c40a 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -107,13 +107,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction // We'll pull common formatting out of this for other formats $atom = new AtomGroupNoticeFeed($this->group); - // Calculate self link - $id = $this->arg('id'); - $aargs = array('format' => $this->format); - if (!empty($id)) { - $aargs['id'] = $id; - } - $self = $this->getSelfUri('ApiTimelineGroup', $aargs); + $self = $this->getSelfUri(); switch($this->format) { case 'xml': diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 5c4bcace4..11431a82c 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -122,13 +122,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction array('nickname' => $this->user->nickname) ); - // Calculate self link - $id = $this->arg('id'); - $aargs = array('format' => $this->format); - if (!empty($id)) { - $aargs['id'] = $id; - } - $self = $this->getSelfUri('ApiTimelineUser', $aargs); + $self = $this->getSelfUri(); // FriendFeed's SUP protocol // Also added RSS and Atom feeds |