From: Evan Prodromou <evan@status.net>
Date: Thu, 23 Jun 2011 15:38:46 +0000 (-0400)
Subject: ActivityStreamJSONDocument served as application/stream+json
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20396ce8e158c497a1485024ba06805bdcaf8049;p=quix0rs-gnu-social.git

ActivityStreamJSONDocument served as application/stream+json
---

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 2c962b450a..e2cb7c2ee2 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -170,7 +170,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             $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($title);
             $doc->addLink($link,'alternate', 'text/html');
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 33248203bc..e27d052652 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -266,7 +266,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
             $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($title);
             $doc->addLink($link,'alternate', 'text/html');
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 3fc930fa08..136d41bb99 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -135,7 +135,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');
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 3c18a5b0bf..56f0e66d04 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -169,7 +169,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
             $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($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 2b5053a84f..07fbdf0b67 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -170,7 +170,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             $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($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index a786aa15cc..47e253d5fd 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -235,7 +235,7 @@ class ApiTimelinePublicAction 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($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index ef943f4f88..2ea84f16e3 100644
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -138,7 +138,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
 
             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($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index d38e730ac6..03137e7a9a 100644
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -137,7 +137,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
             $this->raw($atom->getString());
             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($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 6c3b135ed9..31e18cf8ee 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -153,7 +153,7 @@ class ApiTimelineTagAction 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($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index b0681c191a..02e4860864 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -202,7 +202,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             $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');