Merge commit 'merge-requests/192' into statusnet_1.1.x

[quix0rs-gnu-social.git] / actions / apitimelinegroup.php

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 3fc930fa08664630a01972676875ba7888d5a466..5a0ea60c7eb9cb6d8ee8bcde13c53222eb3c18e3 100644 (file)
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -106,10 +106,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
         $self = $this->getSelfUri();
 
-        $link = common_local_url(
-            'ApiTimelineGroup',
-            array('nickname' => $this->group->nickname)
-        );
+        $link = common_local_url('showgroup',
+                                 array('nickname' => $this->group->nickname));
 
         switch($this->format) {
         case 'xml':
@@ -135,7 +133,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($atom->title);
             $doc->addLink($link, 'alternate', 'text/html');