Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/feed.php b/lib/feed.php
index 7632aea09c1fb5de9d47a9d3f8ce18a491468c97..d61c3e8a3433a6e1d698809a5eeadb8e0b2bbca1 100644 (file)
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -62,6 +62,11 @@ class Feed
         $this->title = $title;
     }
 
+    function getUrl()
+    {
+        return $this->url;
+    }
+
     function mimeType()
     {
         switch ($this->type) {
@@ -74,7 +79,7 @@ class Feed
          case Feed::FOAF:
             return 'application/rdf+xml';
          case Feed::JSON:
-            return 'application/json';
+            return 'application/stream+json';
          default:
             return null;
         }