Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / lib / activitystreamjsondocument.php

diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 2b99d19eb76f27151c3fced17d7bca3b2416b78e..097267f504e18ceca3be22213388eeb24ddb076a 100644 (file)
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -43,6 +43,7 @@ if (!defined('STATUSNET'))
  */
 class ActivityStreamJSONDocument
 {
+    const CONTENT_TYPE = 'application/stream+json; charset=utf-8';
 
     /* Top level array representing the document */
     protected $doc = array();
@@ -127,7 +128,7 @@ class ActivityStreamJSONDocument
     function addLink($url = null, $rel = null, $mediaType = null)
     {
         $link = new ActivityStreamsLink($url, $rel, $mediaType);
-        $this->doc['link'][] = $link->asArray();
+        $this->doc['links'][] = $link->asArray();
     }
 
     /*