diff options
author | Evan Prodromou <evan@status.net> | 2010-02-25 21:21:03 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-02-25 21:21:03 -0500 |
commit | 195e0466ecafaeefab7f8d12e5697e1d46918486 (patch) | |
tree | af08836068f7948fcfb23575782952a538330d30 /actions/apitimelinegroup.php | |
parent | 79e6fd9c85f16a2fccf6f7f8c287eb140ccd4810 (diff) | |
parent | c49fbb63c56cc851153d0fecec81b4ca92b41bc6 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/apitimelinegroup.php')
-rw-r--r-- | actions/apitimelinegroup.php | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 0bb4860ea..04456ffea 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -107,8 +107,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $sitename = common_config('site', 'name'); $avatar = $this->group->homepage_logo; $title = sprintf(_("%s timeline"), $this->group->nickname); - $taguribase = TagURI::base(); - $id = "tag:$taguribase:GroupTimeline:" . $this->group->id; $subtitle = sprintf( _('Updates from %1$s on %2$s!'), @@ -138,19 +136,9 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction try { - // If this was called using an integer ID, i.e.: using the canonical - // URL for this group's feed, then pass the Group object into the feed, - // so the OStatus plugin, and possibly other plugins, can access it. - // Feels sorta hacky. -- Z + $atom = new AtomGroupNoticeFeed($this->group); - $atom = null; - $id = $this->arg('id'); - - if (strval(intval($id)) === strval($id)) { - $atom = new AtomGroupNoticeFeed($this->group); - } else { - $atom = new AtomGroupNoticeFeed(); - } + // @todo set all this Atom junk up inside the feed class $atom->setId($id); $atom->setTitle($title); @@ -169,6 +157,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $aargs['id'] = $id; } + $atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs)); + $atom->addLink( $this->getSelfUri('ApiTimelineGroup', $aargs), array('rel' => 'self', 'type' => 'application/atom+xml') |