summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-13 14:27:22 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-13 14:27:22 -0400
commit858e3e765f995729542821b04c07876f0d360245 (patch)
treea2f63d5a0d96572ee5663ae09caa240a19c05564
parent824e04d50bd9bdfd0f7cb5fac22e0f2da41785be (diff)
parent7654d690223f63c5af608da0981213b8f500deb9 (diff)
Merge branch 'groups-timeline-atom-fix' into 0.8.x
-rw-r--r--actions/twitapigroups.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index db15b2cd3..71a0776f4 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -94,11 +94,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
case 'atom':
if (isset($apidata['api_arg'])) {
$selfuri = common_root_url() .
- 'api/statuses/groups/timeline/' .
+ 'api/laconica/groups/timeline/' .
$apidata['api_arg'] . '.atom';
} else {
$selfuri = common_root_url() .
- 'api/statuses/groups/timeline.atom';
+ 'api/laconica/groups/timeline.atom';
}
$this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, $suplink, $selfuri);
@@ -111,4 +111,4 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
}
}
-} \ No newline at end of file
+}