Merge branch 'groups-timeline-atom-fix' into 0.8.x

This commit is contained in:
Craig Andrews 2009-07-13 14:27:22 -04:00
commit 858e3e765f

View File

@ -94,11 +94,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
case 'atom': case 'atom':
if (isset($apidata['api_arg'])) { if (isset($apidata['api_arg'])) {
$selfuri = common_root_url() . $selfuri = common_root_url() .
'api/statuses/groups/timeline/' . 'api/laconica/groups/timeline/' .
$apidata['api_arg'] . '.atom'; $apidata['api_arg'] . '.atom';
} else { } else {
$selfuri = common_root_url() . $selfuri = common_root_url() .
'api/statuses/groups/timeline.atom'; 'api/laconica/groups/timeline.atom';
} }
$this->show_atom_timeline($notice, $title, $id, $link, $this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, $suplink, $selfuri); $subtitle, $suplink, $selfuri);