2 files changed, 20 insertions, 6 deletions

diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php
index 3487423f..54a56f22 100644
--- a/inc/3rdparty/libraries/feedwriter/FeedItem.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedItem.php
@@ -174,7 +174,8 @@
     */

     public function setSource($link) 

     {

-        $this->setElement('source', $link);

+        $attributes = array('url'=>$link);

+        $this->setElement('source', "wallabag",$attributes);

     }

     

     /**

diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
index 79639c0c..d708e99b 100755
--- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php
@@ -87,12 +87,25 @@ define('JSONP', 3, true);
     * @access   public

     * @return   void

     */

-    public function genarateFeed()

+    public function genarateFeed($withHeaders = true)

     {

-        header('Content-type: text/xml; charset=UTF-8');

-        // this line prevents Chrome 20 from prompting download

-        // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss

-        header('X-content-type-options: nosniff');

+        if ($withHeaders) {

+          if ($this->version == RSS2) {

+              header('Content-type: text/xml; charset=UTF-8');

+              // this line prevents Chrome 20 from prompting download

+              // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss

+              header('X-content-type-options: nosniff');

+          } elseif ($this->version == JSON) {

+              header('Content-type: application/json; charset=UTF-8');

+          } elseif ($this->version == JSONP) {

+              header('Content-type: application/javascript; charset=UTF-8');

+          }

+        }

+      

+        if ($this->version == JSON || $this->version == JSONP) {

+          $this->json = new stdClass();

+        }

+      

 

         $this->printHead();

         $this->printChannels();