summaryrefslogtreecommitdiff
path: root/actions/apitimelinegroup.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-12 11:18:35 -0800
committerBrion Vibber <brion@pobox.com>2010-02-12 11:18:35 -0800
commit122c8677b7004bae4cfe7e2bd49fc1bc3187c72c (patch)
tree552bf77b587fbb674329a95745067f358c0a25d3 /actions/apitimelinegroup.php
parent3c79448cd817d01b4421262fefc29eb558cede20 (diff)
parentfd3c9334bfcfe627446feb86ac3054b24ed05449 (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/apitimelinegroup.php')
-rw-r--r--actions/apitimelinegroup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index af414c680..fd2ed9ff9 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -130,7 +130,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
case 'atom':
$selfuri = common_root_url() .
'api/statusnet/groups/timeline/' .
- $this->group->nickname . '.atom';
+ $this->group->id . '.atom';
$this->showAtomTimeline(
$this->notices,
$title,